Merge lp:~3v1n0/unity/switcher-dynamic-model into lp:unity

[Marco Trevisan (Treviño)]

SwitcherModel: allow to add/remove icons dynamically and update them when they require it

We keep hidden applications in a separated vector; when an application becomes
invisible in switcher we need to move it to the hidden_applications_ vector,
if it becomes visible again we put it back on the main model vector.

[lp:~3v1n0/unity/switcher-dynamic-model]

4044. By Marco Trevisan (Treviño) on 2015-11-02

SwitcherModel: even more cleanup

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4044
http://jenkins.qa.ubuntu.com/job/unity-ci/1325/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/103/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/101/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1325/rebuild

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/unity/switcher-dynamic-model]

4045. By Marco Trevisan (Treviño) on 2015-11-02

SwitcherModel: fix signed/unsigned comparisons

4046. By Marco Trevisan (Treviño) on 2015-11-02

AbstractLauncherIcon: move signals to base class, use proper naming

4047. By Marco Trevisan (Treviño) on 2015-11-02

SwitcherModel: only connect to quirks_changed and windows_changed signals

They're more than enough to get proper view updates

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4046
http://jenkins.qa.ubuntu.com/job/unity-ci/1327/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/105/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/103/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/103/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1327/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4047
http://jenkins.qa.ubuntu.com/job/unity-ci/1330/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/106/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/106/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1330/rebuild

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/unity/switcher-dynamic-model]

4048. By Marco Trevisan (Treviño) on 2015-11-03

SwitcherModel: avoid signed/unsigned comparisons

4049. By Marco Trevisan (Treviño) on 2015-11-04

SwitcherModel: use old behavior in {Next,Pre}DetailRow

4050. By Marco Trevisan (Treviño) on 2015-11-04

TestSwitcherController: ensure that icons are visible in switcher, or tests will fail

4051. By Marco Trevisan (Treviño) on 2015-11-04

TestSwitcherModel: use new constructor

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4051
http://jenkins.qa.ubuntu.com/job/unity-ci/1331/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/107
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/107/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1331/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4051
http://jenkins.qa.ubuntu.com/job/unity-ci/1332/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/108/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1332/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM. I have been running it for few days and I could not spot any regression.

review: Approve

[lp:~3v1n0/unity/switcher-dynamic-model]

4052. By Marco Trevisan (Treviño) on 2015-12-04

LauncherController: get all icons for AltTab, it's up to the Model to filter them

=== modified file 'launcher/AbstractLauncherIcon.h'
--- launcher/AbstractLauncherIcon.h	2015-03-20 16:23:04 +0000
+++ launcher/AbstractLauncherIcon.h	2015-12-04 17:15:35 +0000
@@ -253,6 +253,8 @@
   sigc::signal<void, AbstractLauncherIcon::Ptr const&> remove;
   sigc::signal<void, nux::ObjectPtr<nux::View>> tooltip_visible;
   sigc::signal<void, int> visibility_changed;
+  sigc::signal<void, int> windows_changed;
+  sigc::signal<void, Quirk, int> quirks_changed;
   sigc::signal<void> position_saved;
   sigc::signal<void> position_forgot;
   sigc::signal<void, std::string const&> uri_changed;

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2015-10-27 19:21:27 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2015-12-04 17:15:35 +0000
@@ -736,8 +736,6 @@
 
   for (unsigned i = 0; i < monitors::MAX; ++i)
     SetNumberOfWindowsVisibleOnMonitor(number_of_windows_on_monitor[i], i);
-
-  WindowsChanged.emit();
 }
 
 void ApplicationLauncherIcon::EnsureWindowsLocation()
@@ -1245,29 +1243,24 @@
 
 bool ApplicationLauncherIcon::ShowInSwitcher(bool current)
 {
-  bool result = false;
-
-  if (IsRunning() && IsVisible())
+  if (!removed() && IsRunning() && IsVisible())
   {
     // If current is true, we only want to show the current workspace.
     if (!current)
     {
-      result = true;
+      return true;
     }
     else
     {
       for (unsigned i = 0; i < monitors::MAX; ++i)
       {
         if (WindowVisibleOnMonitor(i))
-        {
-          result = true;
-          break;
-        }
+          return true;
       }
     }
   }
 
-  return result;
+  return false;
 }
 
 bool ApplicationLauncherIcon::AllowDetailViewInSwitcher() const

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2015-10-27 19:04:37 +0000
+++ launcher/LauncherController.cpp	2015-12-04 17:15:35 +0000
@@ -1049,6 +1049,8 @@
   favorite_store.favorite_removed.connect(sigc::mem_fun(this, &Impl::OnFavoriteStoreFavoriteRemoved));
   favorite_store.reordered.connect(sigc::mem_fun(this, &Impl::ResetIconPriorities));
 
+  model_->icon_added.connect(sigc::mem_fun(&parent_->icon_added, &decltype(parent_->icon_added)::emit));
+  model_->icon_removed.connect(sigc::mem_fun(&parent_->icon_removed, &decltype(parent_->icon_removed)::emit));
   model_->order_changed.connect(sigc::mem_fun(this, &Impl::SortAndUpdate));
   model_->icon_removed.connect(sigc::mem_fun(this, &Impl::OnIconRemoved));
   model_->saved.connect(sigc::mem_fun(this, &Impl::SaveIconsOrder));
@@ -1115,13 +1117,10 @@
 
   for (auto icon : *(pimpl->model_))
   {
-    if (icon->ShowInSwitcher(current))
+    //otherwise we get two desktop icons in the switcher.
+    if (icon->GetIconType() != AbstractLauncherIcon::IconType::DESKTOP)
     {
-      //otherwise we get two desktop icons in the switcher.
-      if (icon->GetIconType() != AbstractLauncherIcon::IconType::DESKTOP)
-      {
-        results.push_back(icon);
-      }
+      results.push_back(icon);
     }
   }
   return results;

=== modified file 'launcher/LauncherController.h'
--- launcher/LauncherController.h	2014-03-20 00:04:14 +0000
+++ launcher/LauncherController.h	2015-12-04 17:15:35 +0000
@@ -80,6 +80,9 @@
 
   void ClearTooltips();
 
+  sigc::signal<void, AbstractLauncherIcon::Ptr const&> icon_added;
+  sigc::signal<void, AbstractLauncherIcon::Ptr const&> icon_removed;
+
 protected:
   // Introspectable methods
   std::string GetName() const;

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2015-10-05 16:52:24 +0000
+++ launcher/LauncherIcon.cpp	2015-12-04 17:15:35 +0000
@@ -750,9 +750,9 @@
     return;
 
   _has_visible_window[monitor] = (number_of_windows > 0);
-
   _number_of_visible_windows[monitor] = number_of_windows;
 
+  windows_changed.emit(monitor);
   EmitNeedsRedraw(monitor);
 }
 
@@ -895,7 +895,7 @@
   if (quirk == Quirk::VISIBLE)
     visibility_changed.emit(monitor);
 
-  QuirksChanged.emit();
+  quirks_changed.emit(quirk, monitor);
 }
 
 void LauncherIcon::FullyAnimateQuirkDelayed(guint ms, LauncherIcon::Quirk quirk, int monitor)

=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2015-03-20 16:23:04 +0000
+++ launcher/LauncherIcon.h	2015-12-04 17:15:35 +0000
@@ -139,9 +139,6 @@
 
   void SkipQuirkAnimation(Quirk quirk, int monitor = -1);
 
-  sigc::signal<void> QuirksChanged;
-  sigc::signal<void> WindowsChanged;
-
   IconType GetIconType() const;
 
   virtual nux::Color BackgroundColor() const;

=== modified file 'launcher/LauncherModel.cpp'
--- launcher/LauncherModel.cpp	2014-01-13 21:03:53 +0000
+++ launcher/LauncherModel.cpp	2015-12-04 17:15:35 +0000
@@ -43,19 +43,21 @@
   .add("selection", selection_);
 }
 
-unity::debug::Introspectable::IntrospectableList LauncherModel::GetIntrospectableChildren()
+debug::Introspectable::IntrospectableList LauncherModel::GetIntrospectableChildren()
 {
   int order = 0;
-  introspection_results_.clear();
+  std::list<unity::debug::Introspectable*> children;
 
-  for (auto icon : _inner)
+  for (auto const& icon : _inner)
+  {
     if (!icon->removed)
     {
       icon->SetOrder(++order);
-      introspection_results_.push_back(icon.GetPointer());
+      children.push_back(icon.GetPointer());
     }
+  }
 
-  return introspection_results_;
+  return children;
 }
 
 bool LauncherModel::IconShouldShelf(AbstractLauncherIcon::Ptr const& icon) const

=== modified file 'launcher/LauncherModel.h'
--- launcher/LauncherModel.h	2013-09-19 16:44:03 +0000
+++ launcher/LauncherModel.h	2015-12-04 17:15:35 +0000
@@ -96,7 +96,6 @@
   Base             _inner_shelf;
   Base             _inner_main;
   int              selection_;
-  std::list<unity::debug::Introspectable*> introspection_results_;
   glib::SourceManager timeouts_;
 
   bool Populate();

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2015-04-03 15:46:16 +0000
+++ launcher/SwitcherController.cpp	2015-12-04 17:15:35 +0000
@@ -45,25 +45,6 @@
 const std::string VIEW_CONSTRUCT_IDLE = "view-construct-idle";
 const unsigned FADE_DURATION = 80;
 const int XY_OFFSET = 100;
-
-/**
- * Helper comparison functor for sorting application icons.
- */
-bool CompareSwitcherItemsPriority(AbstractLauncherIcon::Ptr const& first,
-                                  AbstractLauncherIcon::Ptr const& second)
-{
-  if (first->GetIconType() == second->GetIconType())
-    return first->SwitcherPriority() > second->SwitcherPriority();
-
-  if (first->GetIconType() == AbstractLauncherIcon::IconType::DESKTOP)
-    return true;
-
-  if (second->GetIconType() == AbstractLauncherIcon::IconType::DESKTOP)
-    return false;
-
-  return first->GetIconType() < second->GetIconType();
-}
-
 }
 
 namespace switcher
@@ -98,7 +79,7 @@
 
 void Controller::Show(ShowMode show,
                       SortMode sort,
-                      std::vector<AbstractLauncherIcon::Ptr> results)
+                      std::vector<AbstractLauncherIcon::Ptr> const& results)
 {
   auto uscreen = UScreen::GetDefault();
   monitor_     = uscreen->GetMonitorWithMouse();
@@ -106,6 +87,16 @@
   impl_->Show(show, sort, results);
 }
 
+void Controller::AddIcon(AbstractLauncherIcon::Ptr const& icon)
+{
+  impl_->AddIcon(icon);
+}
+
+void Controller::RemoveIcon(AbstractLauncherIcon::Ptr const& icon)
+{
+  impl_->RemoveIcon(icon);
+}
+
 void Controller::Select(int index)
 {
   if (Visible())
@@ -290,23 +281,33 @@
     view_->background_color = new_color;
 }
 
-
-void Controller::Impl::Show(ShowMode show, SortMode sort, std::vector<AbstractLauncherIcon::Ptr> results)
+void Controller::Impl::AddIcon(AbstractLauncherIcon::Ptr const& icon)
+{
+  if (!obj_->visible_ || !model_)
+    return;
+
+  model_->AddIcon(icon);
+}
+
+void Controller::Impl::RemoveIcon(AbstractLauncherIcon::Ptr const& icon)
+{
+  if (!obj_->visible_ || !model_)
+    return;
+
+  model_->RemoveIcon(icon);
+}
+
+void Controller::Impl::Show(ShowMode show_mode, SortMode sort_mode, std::vector<AbstractLauncherIcon::Ptr> const& results)
 {
   if (results.empty() || obj_->visible_)
     return;
 
-  if (sort == SortMode::FOCUS_ORDER)
-  {
-    std::sort(results.begin(), results.end(), CompareSwitcherItemsPriority);
-  }
-
-  model_ = std::make_shared<SwitcherModel>(results);
-  obj_->AddChild(model_.get());
+  model_ = std::make_shared<SwitcherModel>(results, (sort_mode == SortMode::FOCUS_ORDER));
+  model_->only_apps_on_viewport = (show_mode == ShowMode::CURRENT_VIEWPORT);
   model_->selection_changed.connect(sigc::mem_fun(this, &Controller::Impl::OnModelSelectionChanged));
   model_->detail_selection.changed.connect([this] (bool) { sources_.Remove(DETAIL_TIMEOUT); });
-  model_->request_detail_hide.connect(sigc::mem_fun(this, &Controller::Impl::DetailHide));
-  model_->only_detail_on_viewport = (show == ShowMode::CURRENT_VIEWPORT);
+  model_->updated.connect([this] { if (!model_->Size()) Hide(false); });
+  obj_->AddChild(model_.get());
 
   SelectFirstItem();
 
@@ -427,9 +428,7 @@
   view_->SetModel(model_);
   view_->background_color = WindowManager::Default().average_color();
   view_->monitor = obj_->monitor_;
-
   view_->hide_request.connect(sigc::mem_fun(this, &Controller::Impl::Hide));
-
   view_->switcher_mouse_up.connect([this] (int icon_index, int button) {
     if (button == 3)
       InitiateDetail(true);
@@ -478,15 +477,6 @@
   animation::StartOrReverse(fade_animator_, animation::Direction::BACKWARD);
 }
 
-void Controller::Impl::DetailHide()
-{
-  // FIXME We need to refactor SwitcherModel so we can add/remove icons without causing
-  // a crash. If you remove the last application in the list it crashes.
-  obj_->detail.changed.emit(false);
-  model_->detail_selection = false;
-  Hide(false);
-}
-
 void Controller::Impl::HideWindow()
 {
   if (model_->detail_selection())
@@ -715,7 +705,7 @@
   {
     Window xid = window->window_id();
 
-    if (model_->only_detail_on_viewport && !wm.IsWindowOnCurrentDesktop(xid))
+    if (model_->only_apps_on_viewport && !wm.IsWindowOnCurrentDesktop(xid))
       continue;
 
     uint64_t num = wm.GetWindowActiveNumber(xid);

=== modified file 'launcher/SwitcherController.h'
--- launcher/SwitcherController.h	2015-04-03 15:32:24 +0000
+++ launcher/SwitcherController.h	2015-12-04 17:15:35 +0000
@@ -72,7 +72,7 @@
 };
 
 
-class Controller : public debug::Introspectable
+class Controller : public debug::Introspectable, public sigc::trackable
 {
 public:
   class Impl;
@@ -87,10 +87,12 @@
 
   void Show(ShowMode show,
             SortMode sort,
-            std::vector<launcher::AbstractLauncherIcon::Ptr> results);
+            std::vector<launcher::AbstractLauncherIcon::Ptr> const& results);
   void Hide(bool accept_state=true);
 
-  bool CanShowSwitcher(const std::vector<launcher::AbstractLauncherIcon::Ptr>& resutls) const;
+  bool CanShowSwitcher(std::vector<launcher::AbstractLauncherIcon::Ptr> const& resutls) const;
+  void AddIcon(launcher::AbstractLauncherIcon::Ptr const&);
+  void RemoveIcon(launcher::AbstractLauncherIcon::Ptr const&);
 
   bool Visible();
   nux::Geometry GetInputWindowGeometry() const;

=== modified file 'launcher/SwitcherControllerImpl.h'
--- launcher/SwitcherControllerImpl.h	2014-03-25 19:07:36 +0000
+++ launcher/SwitcherControllerImpl.h	2015-12-04 17:15:35 +0000
@@ -46,9 +46,11 @@
        Controller::WindowCreator const& create_window);
   virtual ~Impl() {}
 
-  void Show(ShowMode show, SortMode sort, std::vector<launcher::AbstractLauncherIcon::Ptr> results);
+  void Show(ShowMode show, SortMode sort, std::vector<launcher::AbstractLauncherIcon::Ptr> const& results);
   void Hide(bool accept_state);
-  void DetailHide();
+
+  void AddIcon(launcher::AbstractLauncherIcon::Ptr const&);
+  void RemoveIcon(launcher::AbstractLauncherIcon::Ptr const&);
 
   void StartDetailMode();
   void StopDetailMode();

=== modified file 'launcher/SwitcherModel.cpp'
--- launcher/SwitcherModel.cpp	2015-04-03 15:19:31 +0000
+++ launcher/SwitcherModel.cpp	2015-12-04 17:15:35 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Canonical Ltd
+ * Copyright (C) 2011-2015 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 #include <math.h>
@@ -28,41 +29,207 @@
 
 namespace switcher
 {
-
-
-SwitcherModel::SwitcherModel(std::vector<AbstractLauncherIcon::Ptr> const& icons)
+namespace
+{
+/**
+ * Helper comparison functor for sorting application icons.
+ */
+bool CompareSwitcherItemsPriority(AbstractLauncherIcon::Ptr const& first,
+                                  AbstractLauncherIcon::Ptr const& second)
+{
+  if (first->GetIconType() == second->GetIconType())
+    return first->SwitcherPriority() > second->SwitcherPriority();
+
+  if (first->GetIconType() == AbstractLauncherIcon::IconType::DESKTOP)
+    return true;
+
+  if (second->GetIconType() == AbstractLauncherIcon::IconType::DESKTOP)
+    return false;
+
+  return first->GetIconType() < second->GetIconType();
+}
+}
+
+
+SwitcherModel::SwitcherModel(std::vector<AbstractLauncherIcon::Ptr> const& icons, bool sort_by_priority)
   : detail_selection(false)
   , detail_selection_index(0)
-  , only_detail_on_viewport(false)
+  , only_apps_on_viewport(true)
   , applications_(icons)
+  , sort_by_priority_(sort_by_priority)
   , index_(0)
   , last_index_(0)
   , row_index_(0)
 {
-  // When using Webapps, there are more than one active icon, so let's just pick
-  // up the first one found which is the web browser.
-  bool found = false;
-  int order = 0;
-
+  for (auto it = applications_.begin(); it != applications_.end();)
+  {
+    ConnectToIconSignals(*it);
+
+    if (!(*it)->ShowInSwitcher(only_apps_on_viewport))
+    {
+      hidden_applications_.push_back(*it);
+      it = applications_.erase(it);
+      continue;
+    }
+
+    ++it;
+  }
+
+  if (sort_by_priority_)
+    std::sort(std::begin(applications_), std::end(applications_), CompareSwitcherItemsPriority);
+
+  UpdateLastActiveApplication();
+
+  only_apps_on_viewport.changed.connect([this] (bool) {
+    VerifyApplications();
+  });
+}
+
+void SwitcherModel::UpdateLastActiveApplication()
+{
   for (auto const& application : applications_)
   {
-    application->SetOrder(++order);
-
-    AddChild(application.GetPointer());
-    if (application->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE) && !found)
+    if (application->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE))
     {
       last_active_application_ = application;
-      found = true;
-    }
-  }
-}
-
-SwitcherModel::~SwitcherModel()
-{
-  for (auto const& application : applications_)
-  {
-    RemoveChild(application.GetPointer());
-  }
+      break;
+    }
+  }
+}
+
+void SwitcherModel::VerifyApplications()
+{
+  bool anything_changed = false;
+
+  for (auto it = applications_.begin(); it != applications_.end();)
+  {
+    if (!(*it)->ShowInSwitcher(only_apps_on_viewport))
+    {
+      unsigned icon_index = it - applications_.begin();
+      hidden_applications_.push_back(*it);
+      it = applications_.erase(it);
+      anything_changed = true;
+      bool was_in_detail = (detail_selection && icon_index == index_);
+
+      if (icon_index < index_ || index_ == applications_.size())
+        PrevIndex();
+
+      if (was_in_detail)
+        UnsetDetailSelection();
+
+      continue;
+    }
+
+    ++it;
+  }
+
+  for (auto it = hidden_applications_.begin(); it != hidden_applications_.end();)
+  {
+    if ((*it)->ShowInSwitcher(only_apps_on_viewport))
+    {
+      InsertIcon(*it);
+      it = hidden_applications_.erase(it);
+      anything_changed = true;
+      continue;
+    }
+
+    ++it;
+  }
+
+  if (anything_changed)
+  {
+    if (!last_active_application_ || !last_active_application_->ShowInSwitcher(only_apps_on_viewport))
+      UpdateLastActiveApplication();
+
+    updated.emit();
+  }
+}
+
+void SwitcherModel::InsertIcon(AbstractLauncherIcon::Ptr const& application)
+{
+  if (sort_by_priority_)
+  {
+    auto pos = std::upper_bound(applications_.begin(), applications_.end(), application, CompareSwitcherItemsPriority);
+    unsigned icon_index = pos - applications_.begin();
+    applications_.insert(pos, application);
+
+    if (icon_index <= index_)
+      NextIndex();
+  }
+  else
+  {
+    applications_.push_back(application);
+  }
+}
+
+void SwitcherModel::ConnectToIconSignals(launcher::AbstractLauncherIcon::Ptr const& icon)
+{
+  icon->quirks_changed.connect(sigc::hide(sigc::hide(sigc::mem_fun(this, &SwitcherModel::OnIconQuirksChanged))));
+  icon->windows_changed.connect(sigc::hide(sigc::mem_fun(&updated, &decltype(updated)::emit)));
+}
+
+void SwitcherModel::AddIcon(AbstractLauncherIcon::Ptr const& icon)
+{
+  if (!icon || icon->GetIconType() != AbstractLauncherIcon::IconType::APPLICATION)
+    return;
+
+  if (icon->ShowInSwitcher(only_apps_on_viewport))
+  {
+    if (icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE))
+      last_active_application_ = icon;
+
+    if (std::find(applications_.begin(), applications_.end(), icon) == applications_.end())
+    {
+      InsertIcon(icon);
+      ConnectToIconSignals(icon);
+      updated.emit();
+    }
+  }
+  else if (std::find(hidden_applications_.begin(), hidden_applications_.end(), icon) == hidden_applications_.end())
+  {
+    hidden_applications_.push_back(icon);
+    ConnectToIconSignals(icon);
+  }
+}
+
+void SwitcherModel::RemoveIcon(launcher::AbstractLauncherIcon::Ptr const& icon)
+{
+  auto icon_it = std::find(applications_.begin(), applications_.end(), icon);
+  if (icon_it != applications_.end())
+  {
+    unsigned icon_index = icon_it - applications_.begin();
+    bool was_in_detail = (detail_selection && icon_index == index_);
+    applications_.erase(icon_it);
+
+    if (last_active_application_ == icon)
+      UpdateLastActiveApplication();
+
+    if (icon_index < index_ || index_ == applications_.size())
+      PrevIndex();
+
+    if (was_in_detail)
+      UnsetDetailSelection();
+
+    updated.emit();
+  }
+  else
+  {
+    hidden_applications_.erase(std::remove(hidden_applications_.begin(), hidden_applications_.end(), icon), hidden_applications_.end());
+  }
+}
+
+void SwitcherModel::OnIconQuirksChanged()
+{
+  auto old_selection = Selection();
+  VerifyApplications();
+
+  if (old_selection == last_active_application_)
+    UpdateLastActiveApplication();
+
+  auto const& new_selection = Selection();
+
+  if (old_selection != new_selection)
+    selection_changed.emit(new_selection);
 }
 
 std::string SwitcherModel::GetName() const
@@ -74,14 +241,31 @@
 {
   introspection
   .add("detail-selection", detail_selection)
-  .add("detail-selection-index", (int)detail_selection_index)
+  .add("detail-selection-index", detail_selection_index())
   .add("detail-current-count", DetailXids().size())
   .add("detail-windows", glib::Variant::FromVector(DetailXids()))
-  .add("only-detail-on-viewport", only_detail_on_viewport)
+  .add("only-apps-on-viewport", only_apps_on_viewport())
   .add("selection-index", SelectionIndex())
   .add("last-selection-index", LastSelectionIndex());
 }
 
+debug::Introspectable::IntrospectableList SwitcherModel::GetIntrospectableChildren()
+{
+  debug::Introspectable::IntrospectableList children;
+  unsigned order = 0;
+
+  for (auto const& icon : applications_)
+  {
+    if (!icon->ShowInSwitcher(only_apps_on_viewport))
+    {
+      icon->SetOrder(++order);
+      children.push_back(icon.GetPointer());
+    }
+  }
+
+  return children;
+}
+
 SwitcherModel::iterator SwitcherModel::begin()
 {
   return applications_.begin();
@@ -104,12 +288,13 @@
 
 AbstractLauncherIcon::Ptr SwitcherModel::at(unsigned int index) const
 {
-  if ((int) index >= Size ())
+  if (index >= applications_.size())
     return AbstractLauncherIcon::Ptr();
+
   return applications_[index];
 }
 
-int SwitcherModel::Size() const
+size_t SwitcherModel::Size() const
 {
   return applications_.size();
 }
@@ -148,21 +333,18 @@
   {
     Window xid = window->window_id();
 
-    if (!only_detail_on_viewport || wm.IsWindowOnCurrentDesktop(xid))
+    if (!only_apps_on_viewport || wm.IsWindowOnCurrentDesktop(xid))
       results.push_back(xid);
   }
 
-  if (results.empty() && detail_selection)
-  {
-    request_detail_hide.emit();
+  if (results.empty())
     return results;
-  }
 
   std::sort(results.begin(), results.end(), [&wm](Window first, Window second) {
-      return wm.GetWindowActiveNumber(first) > wm.GetWindowActiveNumber(second);
+    return wm.GetWindowActiveNumber(first) > wm.GetWindowActiveNumber(second);
   });
 
-  if (Selection() == last_active_application_ && results.size() > 1)
+  if (Selection() == last_active_application_)
   {
     results.push_back(results.front());
     results.erase(results.begin());
@@ -183,32 +365,36 @@
   return windows[detail_selection_index];
 }
 
+void SwitcherModel::UnsetDetailSelection()
+{
+  detail_selection = false;
+  detail_selection_index = 0;
+  row_index_ = 0;
+}
+
+void SwitcherModel::NextIndex()
+{
+  last_index_ = index_;
+  ++index_ %= applications_.size();
+}
+
 void SwitcherModel::Next()
 {
+  NextIndex();
+  UnsetDetailSelection();
+  selection_changed.emit(Selection());
+}
+
+void SwitcherModel::PrevIndex()
+{
   last_index_ = index_;
-
-  index_++;
-  if (index_ >= applications_.size())
-    index_ = 0;
-
-  detail_selection = false;
-  detail_selection_index = 0;
-  row_index_ = 0;
-  selection_changed.emit(Selection());
+  index_ = ((index_ > 0 && index_ < applications_.size()) ? index_ : applications_.size()) - 1;
 }
 
 void SwitcherModel::Prev()
 {
-  last_index_ = index_;
-
-  if (index_ > 0)
-    index_--;
-  else
-    index_ = applications_.size() - 1;
-
-  detail_selection = false;
-  detail_selection_index = 0;
-  row_index_ = 0;
+  PrevIndex();
+  UnsetDetailSelection();
   selection_changed.emit(Selection());
 }
 
@@ -217,11 +403,7 @@
   if (!detail_selection())
     return;
 
-  if (detail_selection_index < DetailXids().size() - 1)
-    detail_selection_index = detail_selection_index + 1;
-  else
-    detail_selection_index = 0;
-
+  detail_selection_index = (detail_selection_index + 1) % DetailXids().size();
   UpdateRowIndex();
 }
 
@@ -230,11 +412,7 @@
   if (!detail_selection())
     return;
 
-  if (detail_selection_index >= (unsigned int) 1)
-    detail_selection_index = detail_selection_index - 1;
-  else
-    detail_selection_index = DetailXids().size() - 1;
-
+  detail_selection_index = ((detail_selection_index() > 0) ? detail_selection_index : DetailXids().size()) - 1;
   UpdateRowIndex();
 }
 
@@ -253,7 +431,7 @@
       return;
     }
 
-    current_row++;
+    ++current_row;
   }
 }
 
@@ -289,11 +467,11 @@
       increment = next_row;
 
     detail_selection_index = detail_selection_index + increment;
-    row_index_++;
+    ++row_index_;
   }
   else
   {
-    detail_selection_index = detail_selection_index + 1;
+    detail_selection_index = (detail_selection_index + 1) % DetailXids().size();
   }
 }
 
@@ -313,18 +491,18 @@
   }
   else
   {
-    detail_selection_index = detail_selection_index - 1;
+    detail_selection_index = ((detail_selection_index() > 0) ? detail_selection_index : DetailXids().size()) - 1;
   }
 }
 
 bool SwitcherModel::HasNextDetailRow() const
 {
-  return (detail_selection_index < DetailXids().size() - 1);
+  return (detail_selection_index() < DetailXids().size() - 1);
 }
 
 bool SwitcherModel::HasPrevDetailRow() const
 {
-  return (detail_selection_index > (unsigned int) 0);
+  return (detail_selection_index() > 0);
 }
 
 void SwitcherModel::SetRowSizes(std::vector<int> const& row_sizes)
@@ -334,18 +512,17 @@
 
 void SwitcherModel::Select(AbstractLauncherIcon::Ptr const& selection)
 {
-  int i = 0;
+  unsigned i = 0;
   for (iterator it = begin(), e = end(); it != e; ++it)
   {
     if (*it == selection)
     {
-      if ((int) index_ != i)
+      if (index_ != i)
       {
         last_index_ = index_;
         index_ = i;
 
-        detail_selection = false;
-        detail_selection_index = 0;
+        UnsetDetailSelection();
         selection_changed.emit(Selection());
       }
       break;
@@ -363,8 +540,7 @@
     last_index_ = index_;
     index_ = target;
 
-    detail_selection = false;
-    detail_selection_index = 0;
+    UnsetDetailSelection();
     selection_changed.emit(Selection());
   }
 }

=== modified file 'launcher/SwitcherModel.h'
--- launcher/SwitcherModel.h	2015-04-03 15:19:31 +0000
+++ launcher/SwitcherModel.h	2015-12-04 17:15:35 +0000
@@ -59,10 +59,10 @@
 
   nux::Property<bool>         detail_selection;
   nux::Property<unsigned int> detail_selection_index;
-  nux::Property<bool>         only_detail_on_viewport;
+  nux::Property<bool>         only_apps_on_viewport;
 
-  SwitcherModel(std::vector<launcher::AbstractLauncherIcon::Ptr> const& icons);
-  virtual ~SwitcherModel();
+  SwitcherModel(std::vector<launcher::AbstractLauncherIcon::Ptr> const& icons, bool sort_by_priority);
+  virtual ~SwitcherModel() = default;
 
   iterator begin();
   iterator end();
@@ -72,7 +72,10 @@
 
   launcher::AbstractLauncherIcon::Ptr at(unsigned int index) const;
 
-  int Size() const;
+  void AddIcon(launcher::AbstractLauncherIcon::Ptr const&);
+  void RemoveIcon(launcher::AbstractLauncherIcon::Ptr const&);
+
+  size_t Size() const;
 
   launcher::AbstractLauncherIcon::Ptr Selection() const;
   int SelectionIndex() const;
@@ -101,19 +104,31 @@
   void Select(unsigned int index);
 
   sigc::signal<void, launcher::AbstractLauncherIcon::Ptr const&> selection_changed;
-  sigc::signal<void> request_detail_hide;
+  sigc::signal<void> updated;
 
 protected:
   // Introspectable methods
-  std::string GetName() const;
-  void AddProperties(debug::IntrospectionData&);
+  std::string GetName() const override;
+  void AddProperties(debug::IntrospectionData&) override;
+  debug::Introspectable::IntrospectableList GetIntrospectableChildren() override;
 
 private:
   void UpdateRowIndex();
   unsigned int SumNRows(unsigned int n) const;
   bool DetailIndexInLeftHalfOfRow() const;
+  void InsertIcon(launcher::AbstractLauncherIcon::Ptr const&);
+  void ConnectToIconSignals(launcher::AbstractLauncherIcon::Ptr const&);
+  void VerifyApplications();
+  void UpdateLastActiveApplication();
+  void OnIconQuirksChanged();
+  void UnsetDetailSelection();
+
+  void NextIndex();
+  void PrevIndex();
 
   Applications                        applications_;
+  Applications                        hidden_applications_;
+  bool                                sort_by_priority_;
   unsigned int                        index_;
   unsigned int                        last_index_;
   unsigned int                        row_index_;

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2015-02-13 17:19:08 +0000
+++ launcher/SwitcherView.cpp	2015-12-04 17:15:35 +0000
@@ -165,6 +165,7 @@
   model->selection_changed.connect(sigc::mem_fun(this, &SwitcherView::OnSelectionChanged));
   model->detail_selection.changed.connect (sigc::mem_fun (this, &SwitcherView::OnDetailSelectionChanged));
   model->detail_selection_index.changed.connect (sigc::mem_fun (this, &SwitcherView::OnDetailSelectionIndexChanged));
+  model->updated.connect(sigc::mem_fun(this, &SwitcherView::QueueRelayout));
 
   last_icon_selected_ = -1;
 
@@ -648,7 +649,7 @@
   nux::Geometry const& base = GetGeometry();
   nux::Size result(base.width - border_size * 2, base.height - border_size * 2);
 
-  int width_padding = std::max(model_->Size() - 1, 0) * minimum_spacing + tile_size;
+  int width_padding = std::max<int>(model_->Size() - 1, 0) * minimum_spacing + tile_size;
   result.width -= width_padding;
 
   return result;

=== modified file 'plugins/unityshell/src/unity-launcher-icon-accessible.cpp'
--- plugins/unityshell/src/unity-launcher-icon-accessible.cpp	2014-03-11 22:09:15 +0000
+++ plugins/unityshell/src/unity-launcher-icon-accessible.cpp	2015-12-04 17:15:35 +0000
@@ -253,8 +253,8 @@
     g_signal_connect(accessible, "notify::accessible-parent",
                      G_CALLBACK(on_parent_change_cb), self);
 
-  icon->QuirksChanged.connect(sigc::bind(sigc::ptr_fun(on_quirks_change_cb), self));
-  icon->WindowsChanged.connect(sigc::bind(sigc::ptr_fun(on_quirks_change_cb), self));
+  icon->quirks_changed.connect(sigc::hide(sigc::hide(sigc::bind(sigc::ptr_fun(on_quirks_change_cb), self))));
+  icon->windows_changed.connect(sigc::hide(sigc::bind(sigc::ptr_fun(on_quirks_change_cb), self)));
 }
 
 

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2015-10-27 17:35:23 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-12-04 17:15:35 +0000
@@ -318,12 +318,12 @@
 #ifndef USE_GLES
      wt.reset(nux::CreateFromForeignWindow(cScreen->output(),
                                            glXGetCurrentContext(),
-                                           &UnityScreen::initUnity,
+                                           &UnityScreen::InitNuxThread,
                                            this));
 #else
      wt.reset(nux::CreateFromForeignWindow(cScreen->output(),
                                            eglGetCurrentContext(),
-                                           &UnityScreen::initUnity,
+                                           &UnityScreen::InitNuxThread,
                                            this));
 #endif
 
@@ -431,7 +431,7 @@
      ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWITCHER,
                    sigc::mem_fun(this, &UnityScreen::OnLauncherEndKeyNav));
 
-     auto init_plugins_cb = sigc::mem_fun(this, &UnityScreen::initPluginActions);
+     auto init_plugins_cb = sigc::mem_fun(this, &UnityScreen::InitPluginActions);
      sources_.Add(std::make_shared<glib::Idle>(init_plugins_cb, glib::Source::Priority::DEFAULT));
 
      InitGesturesSupport();
@@ -509,7 +509,7 @@
   reset_glib_logging();
 }
 
-void UnityScreen::initAltTabNextWindow()
+void UnityScreen::InitAltTabNextWindow()
 {
   Display* display = screen->dpy();
   KeySym tab_keysym = XStringToKeysym("Tab");
@@ -2766,7 +2766,7 @@
   WM.activate_indicators_key = std::make_pair(modifiers, keysym);
 }
 
-bool UnityScreen::initPluginActions()
+bool UnityScreen::InitPluginActions()
 {
   PluginAdapter& adapter = PluginAdapter::Default();
 
@@ -2872,12 +2872,12 @@
   if (p->vTable->name() == "expo" ||
       p->vTable->name() == "scale")
   {
-    initPluginActions();
+    InitPluginActions();
   }
 
   bool result = screen->initPluginForScreen(p);
   if (p->vTable->name() == "unityshell")
-    initAltTabNextWindow();
+    InitAltTabNextWindow();
 
   return result;
 }
@@ -3512,17 +3512,14 @@
 
 
 /* Start up nux after OpenGL is initialized */
-void UnityScreen::initUnity(nux::NThread* thread, void* InitData)
+void UnityScreen::InitNuxThread(nux::NThread* thread, void* data)
 {
   Timer timer;
-  UnityScreen* self = reinterpret_cast<UnityScreen*>(InitData);
-  self->initLauncher();
+  static_cast<UnityScreen*>(data)->InitUnityComponents();
 
   nux::ColorLayer background(nux::color::Transparent);
   static_cast<nux::WindowThread*>(thread)->SetWindowBackgroundPaintLayer(&background);
-  LOG_INFO(logger) << "UnityScreen::initUnity: " << timer.ElapsedSeconds() << "s";
-
-  nux::GetWindowCompositor().sigHiddenViewWindow.connect(sigc::mem_fun(self, &UnityScreen::OnViewHidden));
+  LOG_INFO(logger) << "UnityScreen::InitNuxThread: " << timer.ElapsedSeconds() << "s";
 }
 
 void UnityScreen::onRedrawRequested()
@@ -3987,12 +3984,14 @@
   }
 }
 
-/* Start up the launcher */
-void UnityScreen::initLauncher()
+/* Start up the unity components */
+void UnityScreen::InitUnityComponents()
 {
   Timer timer;
+  nux::GetWindowCompositor().sigHiddenViewWindow.connect(sigc::mem_fun(this, &UnityScreen::OnViewHidden));
 
   bghash_.reset(new BGHash());
+  LOG_INFO(logger) << "InitUnityComponents-BGHash " << timer.ElapsedSeconds() << "s";
 
   auto xdnd_collection_window = std::make_shared<XdndCollectionWindowImp>();
   auto xdnd_start_stop_notifier = std::make_shared<XdndStartStopNotifierImp>();
@@ -4001,18 +4000,20 @@
 
   launcher_controller_ = std::make_shared<launcher::Controller>(xdnd_manager, edge_barriers_);
   Introspectable::AddChild(launcher_controller_.get());
+  LOG_INFO(logger) << "InitUnityComponents-Launcher " << timer.ElapsedSeconds() << "s";
 
   switcher_controller_ = std::make_shared<switcher::Controller>();
   switcher_controller_->detail.changed.connect(sigc::mem_fun(this, &UnityScreen::OnSwitcherDetailChanged));
   Introspectable::AddChild(switcher_controller_.get());
-
-  LOG_INFO(logger) << "initLauncher-Launcher " << timer.ElapsedSeconds() << "s";
+  launcher_controller_->icon_added.connect(sigc::mem_fun(switcher_controller_.get(), &switcher::Controller::AddIcon));
+  launcher_controller_->icon_removed.connect(sigc::mem_fun(switcher_controller_.get(), &switcher::Controller::RemoveIcon));
+  LOG_INFO(logger) << "InitUnityComponents-Switcher " << timer.ElapsedSeconds() << "s";
 
   /* Setup panel */
   timer.Reset();
   panel_controller_ = std::make_shared<panel::Controller>(menus_, edge_barriers_);
   Introspectable::AddChild(panel_controller_.get());
-  LOG_INFO(logger) << "initLauncher-Panel " << timer.ElapsedSeconds() << "s";
+  LOG_INFO(logger) << "InitUnityComponents-Panel " << timer.ElapsedSeconds() << "s";
 
   /* Setup Places */
   dash_controller_ = std::make_shared<dash::Controller>();
@@ -4027,13 +4028,14 @@
   hud_controller_->icon_size = launcher_controller_->options()->icon_size();
   hud_controller_->tile_size = launcher_controller_->options()->tile_size();
   Introspectable::AddChild(hud_controller_.get());
-  LOG_INFO(logger) << "initLauncher-hud " << timer.ElapsedSeconds() << "s";
+  LOG_INFO(logger) << "InitUnityComponents-Hud " << timer.ElapsedSeconds() << "s";
 
   // Setup Shortcut Hint
   auto base_window_raiser = std::make_shared<shortcut::BaseWindowRaiserImp>();
   auto shortcuts_modeller = std::make_shared<shortcut::CompizModeller>();
   shortcut_controller_ = std::make_shared<shortcut::Controller>(base_window_raiser, shortcuts_modeller);
   Introspectable::AddChild(shortcut_controller_.get());
+  LOG_INFO(logger) << "InitUnityComponents-ShortcutHints " << timer.ElapsedSeconds() << "s";
   ShowFirstRunHints();
 
   // Setup Session Controller
@@ -4044,12 +4046,14 @@
   manager->unlocked.connect(sigc::mem_fun(this, &UnityScreen::OnScreenUnlocked));
   session_dbus_manager_ = std::make_shared<session::DBusManager>(manager);
   session_controller_ = std::make_shared<session::Controller>(manager);
+  LOG_INFO(logger) << "InitUnityComponents-Session " << timer.ElapsedSeconds() << "s";
   Introspectable::AddChild(session_controller_.get());
 
   // Setup Lockscreen Controller
   screensaver_dbus_manager_ = std::make_shared<lockscreen::DBusManager>(manager);
   lockscreen_controller_ = std::make_shared<lockscreen::Controller>(screensaver_dbus_manager_, manager);
   UpdateActivateIndicatorsKey();
+  LOG_INFO(logger) << "InitUnityComponents-Lockscreen " << timer.ElapsedSeconds() << "s";
 
   if (g_file_test((DesktopUtilities::GetUserRuntimeDirectory()+local::LOCKED_STAMP).c_str(), G_FILE_TEST_EXISTS))
     manager->PromptLockScreen();

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2015-10-27 17:33:31 +0000
+++ plugins/unityshell/src/unityshell.h	2015-12-04 17:15:35 +0000
@@ -259,7 +259,10 @@
     SHORTCUT_HINT
   };
 
-  void initAltTabNextWindow ();
+  static void InitNuxThread(nux::NThread* thread, void* data);
+  void InitUnityComponents();
+  bool InitPluginActions();
+  void InitAltTabNextWindow();
 
   void SendExecuteCommand();
 
@@ -267,16 +270,12 @@
   void CreateSuperNewAction(char shortcut, impl::ActionModifiers flag);
   void EnableCancelAction(CancelActionTarget target, bool enabled, int modifiers = 0);
 
-  bool initPluginActions();
-  void initLauncher();
-
   void compizDamageNux(CompRegion const& region);
   void determineNuxDamage(CompRegion &nux_damage);
 
   void onRedrawRequested();
   void Relayout();
 
-  static void initUnity(nux::NThread* thread, void* InitData);
   static void OnStartKeyNav(GVariant* data, void* value);
   static void OnExitKeyNav(GVariant* data, void* value);
 

=== modified file 'tests/autopilot/unity/emulators/switcher.py'
--- tests/autopilot/unity/emulators/switcher.py	2014-08-05 15:45:44 +0000
+++ tests/autopilot/unity/emulators/switcher.py	2015-12-04 17:15:35 +0000
@@ -93,11 +93,11 @@
         """Returns the SwitcherMode that the switcher is currently in."""
         if not self.visible:
             return None
-        if self.model.detail_selection and not self.model.only_detail_on_viewport:
+        if self.model.detail_selection and not self.model.only_apps_on_viewport:
             return SwitcherMode.DETAIL, SwitcherMode.ALL
         elif self.model.detail_selection:
             return SwitcherMode.DETAIL
-        elif not self.model.only_detail_on_viewport:
+        elif not self.model.only_apps_on_viewport:
             return SwitcherMode.ALL
         else:
             return SwitcherMode.NORMAL
@@ -115,7 +115,7 @@
         elif mode == SwitcherMode.ALL:
             logger.debug("Initiating switcher in 'all workspaces' mode. Ctrl+Alt+Tab")
             self.keybinding_hold_part_then_tap("switcher/reveal_all")
-            self.model.only_detail_on_viewport.wait_for(False)
+            self.model.only_apps_on_viewport.wait_for(False)
 
     def next_icon(self):
         """Move to the next icon."""

=== modified file 'tests/test_switcher_controller.cpp'
--- tests/test_switcher_controller.cpp	2015-04-03 15:32:24 +0000
+++ tests/test_switcher_controller.cpp	2015-12-04 17:15:35 +0000
@@ -125,7 +125,7 @@
   //  0, 1,
   //  2, 3
   EXPECT_TRUE(model->HasPrevDetailRow());
-  EXPECT_EQ(static_cast<unsigned int>(model->detail_selection_index), 2);
+  EXPECT_EQ(model->detail_selection_index(), 2);
 }
 
 TEST_F(TestSwitcherController, StopDetailModeMovesPrevRows)

=== modified file 'tests/test_switcher_controller.h'
--- tests/test_switcher_controller.h	2015-02-05 14:35:07 +0000
+++ tests/test_switcher_controller.h	2015-12-04 17:15:35 +0000
@@ -75,6 +75,7 @@
 
   unity::WindowList Windows() override;
   bool AllowDetailViewInSwitcher() const override;
+  bool ShowInSwitcher(bool) override;
   uint64_t SwitcherPriority() override;
 
   bool allow_detail_view_;

=== modified file 'tests/test_switcher_controller_class.cpp'
--- tests/test_switcher_controller_class.cpp	2015-02-09 16:47:24 +0000
+++ tests/test_switcher_controller_class.cpp	2015-12-04 17:15:35 +0000
@@ -64,6 +64,11 @@
   return window_list;
 }
 
+bool FakeLauncherIcon::ShowInSwitcher(bool)
+{
+  return true;
+}
+
 bool FakeLauncherIcon::AllowDetailViewInSwitcher() const
 {
   return allow_detail_view_;

=== modified file 'tests/test_switcher_model.cpp'
--- tests/test_switcher_model.cpp	2013-06-20 20:59:32 +0000
+++ tests/test_switcher_model.cpp	2015-12-04 17:15:35 +0000
@@ -43,7 +43,7 @@
 public:
   MockLauncherIcon2(int id)
   : id_(id)
-  { }
+  {}
 
   int id_;
 };
@@ -61,20 +61,19 @@
   TestSwitcherModel()
   {
     for (int i = 0; i < 4; ++i)
-    {
       icons_.push_back(AbstractLauncherIcon::Ptr(new MockLauncherIcon2(i)));
-    }
+
+    model = std::make_shared<SwitcherModel>(icons_, false);
   }
 
 protected:
   std::vector<AbstractLauncherIcon::Ptr> icons_;
+  SwitcherModel::Ptr model;
 };
 
 
 TEST_F(TestSwitcherModel, TestConstructor)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
-
   EXPECT_EQ(model->Size(), icons_.size());
   EXPECT_EQ(model->Selection(), icons_.front());
   EXPECT_EQ(model->LastSelection(), icons_.front());
@@ -86,8 +85,6 @@
 
 TEST_F(TestSwitcherModel, TestSelection)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
-
   EXPECT_EQ(IdentityOf(model->Selection()), 0);
 
   model->Next();
@@ -126,12 +123,12 @@
 TEST_F(TestSwitcherModel, TestActiveDetailWindowSort)
 {
   // Create a base case for the null hypothesis.
-  SwitcherModel::Ptr model_detail(new SwitcherModel(icons_));
+  auto model_detail = std::make_shared<SwitcherModel>(icons_, false);
   model_detail->detail_selection = true;
 
   // Create a test case with an active detail window.
   icons_.front()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
-  SwitcherModel::Ptr model_detail_active(new SwitcherModel(icons_));
+  auto model_detail_active = std::make_shared<SwitcherModel>(icons_, false);
   model_detail_active->detail_selection = true;
 
   EXPECT_TRUE(model_detail_active->DetailXids().size() > 2);
@@ -150,19 +147,17 @@
 
 TEST_F(TestSwitcherModel, SelectionIsActive)
 {
-  SwitcherModel model(icons_);
-
-  model.Selection()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, false);
-  EXPECT_FALSE(model.SelectionIsActive());
-
-  model.Selection()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
-  EXPECT_TRUE(model.SelectionIsActive());
+  model->Selection()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, false);
+  EXPECT_FALSE(model->SelectionIsActive());
+
+  model->Selection()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
+  EXPECT_TRUE(model->SelectionIsActive());
 }
 
 TEST_F(TestSwitcherModel, TestWebAppActive)
 {
   // Create a base case
-  SwitcherModel::Ptr base_model(new SwitcherModel(icons_));
+  auto base_model = std::make_shared<SwitcherModel>(icons_, false);
 
   // Set the first icon as Active to simulate Firefox being active
   icons_.front()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
@@ -170,18 +165,16 @@
   // Set the last icon as Active to simulate that it is a WebApp
   icons_.back()->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
 
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
-
-  model->DetailXids();
+  auto new_model = std::make_shared<SwitcherModel>(icons_, false);
+  new_model->DetailXids();
 
   // model's front Window should be different than the base case due to the
   // re-sorting in DetailXids().
-  EXPECT_NE(model->DetailXids().front(), base_model->DetailXids().front());
+  EXPECT_NE(new_model->DetailXids().front(), base_model->DetailXids().front());
 }
 
 TEST_F(TestSwitcherModel, TestHasNextDetailRow)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
   model->detail_selection = true;
   model->SetRowSizes({2,2});
 
@@ -190,7 +183,6 @@
 
 TEST_F(TestSwitcherModel, TestHasNextDetailRowStopsAtTheEnd)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
   model->detail_selection = true;
   for (unsigned int i = 0; i < model->DetailXids().size() - 1 &&
        model->HasNextDetailRow(); i++)
@@ -203,7 +195,6 @@
 
 TEST_F(TestSwitcherModel, TestHasPrevDetailRow)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
   model->detail_selection = true;
   model->SetRowSizes({2,2});
 
@@ -216,7 +207,6 @@
 
 TEST_F(TestSwitcherModel, TestHasNextThenPrevDetailRow)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
   model->detail_selection = true;
   model->SetRowSizes({2,2});
 
@@ -231,7 +221,6 @@
 
 TEST_F(TestSwitcherModel, TestNextDetailRow)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
   model->detail_selection = true;
   model->SetRowSizes({2,2});
 
@@ -245,7 +234,6 @@
 
 TEST_F(TestSwitcherModel, TestNextDetailThenNextDetailRow)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
   model->detail_selection = true;
   model->SetRowSizes({2,2});
 
@@ -260,7 +248,6 @@
 
 TEST_F(TestSwitcherModel, TestPrevDetailRow)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
   model->detail_selection = true;
   model->SetRowSizes({2,2});
 
@@ -275,7 +262,6 @@
 
 TEST_F(TestSwitcherModel, TestNextDetailThenPrevDetailRow)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
   model->detail_selection = true;
   model->SetRowSizes({2,2});
 
@@ -292,7 +278,6 @@
 
 TEST_F(TestSwitcherModel, TestUnEvenNextDetailRow)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
   model->detail_selection = true;
   model->SetRowSizes({3,2});
 
@@ -306,7 +291,6 @@
 
 TEST_F(TestSwitcherModel, TestUnEvenPrevDetailRow)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
   model->detail_selection = true;
   model->SetRowSizes({3,2});
 
@@ -321,7 +305,6 @@
 
 TEST_F(TestSwitcherModel, TestNextPrevDetailRowMovesLeftInTopRow)
 {
-  SwitcherModel::Ptr model(new SwitcherModel(icons_));
   model->detail_selection = true;
   model->SetRowSizes({3,2});
 

=== modified file 'tests/test_switcher_view.cpp'
--- tests/test_switcher_view.cpp	2015-03-13 13:49:16 +0000
+++ tests/test_switcher_view.cpp	2015-12-04 17:15:35 +0000
@@ -96,7 +96,7 @@
 
       SwitcherModel::Applications apps;
       apps.push_back(AbstractLauncherIcon::Ptr(app));
-      switcher.SetModel(std::make_shared<SwitcherModel>(apps));
+      switcher.SetModel(std::make_shared<SwitcherModel>(apps, true));
 
       return apps[0];
     }
@@ -130,7 +130,7 @@
   apps.push_back(AbstractLauncherIcon::Ptr(new MockLauncherIcon()));
   apps.push_back(AbstractLauncherIcon::Ptr(new MockLauncherIcon()));
   apps.push_back(AbstractLauncherIcon::Ptr(new MockLauncherIcon()));
-  auto model = std::make_shared<SwitcherModel>(apps);
+  auto model = std::make_shared<SwitcherModel>(apps, false);
 
   switcher.SetModel(model);
   ASSERT_EQ(switcher.model_, model);