Merge lp:~azzar1/unity/lp-1169340 into lp:unity/7.0

[Marco Trevisan (Treviño)]

Disable detail view for webapp icons.

Backporting lp:~andyrock/unity/lp-1169340 to 7.0

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-7.0-autolanding/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-amd64-autolanding/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-armhf-autolanding/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-i386-autolanding/5

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3303
http://jenkins.qa.ubuntu.com/job/unity-7.0-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-7.0-ci/5/rebuild

review: Approve (continuous-integration)

=== modified file 'launcher/AbstractLauncherIcon.h'
--- launcher/AbstractLauncherIcon.h	2013-03-14 18:55:36 +0000
+++ launcher/AbstractLauncherIcon.h	2013-04-26 14:21:59 +0000
@@ -180,6 +180,7 @@
   virtual float GetProgress() = 0;
 
   virtual bool ShowInSwitcher(bool current) = 0;
+  virtual bool AllowDetailViewInSwitcher() const = 0;
 
   virtual unsigned long long SwitcherPriority() = 0;
 
 
=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-04-09 17:02:27 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2013-04-26 14:21:59 +0000
@@ -1254,6 +1254,11 @@
   return result;
 }
 
+bool ApplicationLauncherIcon::AllowDetailViewInSwitcher() const
+{
+  return app_->type() != "webapp";
+}
+
 unsigned long long ApplicationLauncherIcon::SwitcherPriority()
 {
   unsigned long long result = 0;
 
=== modified file 'launcher/ApplicationLauncherIcon.h'
--- launcher/ApplicationLauncherIcon.h	2013-04-05 19:09:21 +0000
+++ launcher/ApplicationLauncherIcon.h	2013-04-26 14:21:59 +0000
@@ -60,6 +60,7 @@
   virtual void UnStick();
 
   virtual bool ShowInSwitcher(bool current);
+  virtual bool AllowDetailViewInSwitcher() const override;
   virtual unsigned long long SwitcherPriority();
 
   virtual nux::Color BackgroundColor() const;
 
=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2013-03-18 12:57:00 +0000
+++ launcher/LauncherIcon.h	2013-04-26 14:21:59 +0000
@@ -119,6 +119,11 @@
     return false;
   };
 
+  virtual bool AllowDetailViewInSwitcher() const override
+  {
+    return false;
+  }
+
   virtual unsigned long long SwitcherPriority()
   {
     return 0;
 
=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2013-03-18 12:57:00 +0000
+++ launcher/MockLauncherIcon.h	2013-04-26 14:21:59 +0000
@@ -215,6 +215,11 @@
     return true;
   }
 
+  bool AllowDetailViewInSwitcher() const override
+  {
+    return true;
+  }
+
   void InsertEntryRemote(LauncherEntryRemote::Ptr const& remote) {}
 
   void RemoveEntryRemote(LauncherEntryRemote::Ptr const& remote) {}
 
=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2013-03-19 18:47:01 +0000
+++ launcher/SwitcherController.cpp	2013-04-26 14:21:59 +0000
@@ -533,13 +533,13 @@
 
 void Controller::Impl::SetDetail(bool value, unsigned int min_windows)
 {
-  if (value && model_->DetailXids().size() >= min_windows)
+  if (value && model_->Selection()->AllowDetailViewInSwitcher() && model_->DetailXids().size() >= min_windows)
   {
     model_->detail_selection = true;
     obj_->detail_mode_ = DetailMode::TAB_NEXT_WINDOW;
   }
   else
-  {
+  { 
     model_->detail_selection = false;
   }
 }
 
=== modified file 'tests/mock-application.h'
--- tests/mock-application.h	2013-03-06 16:38:17 +0000
+++ tests/mock-application.h	2013-04-26 14:21:59 +0000
@@ -84,6 +84,7 @@
     , active_(false)
     , running_(false)
     , urgent_(false)
+    , type_("mock")
     {
       seen.SetGetterFunction(sigc::mem_fun(this, &MockApplication::GetSeen));
       seen.SetSetterFunction(sigc::mem_fun(this, &MockApplication::SetSeen));
@@ -105,12 +106,13 @@
   bool running_;
   bool urgent_;
   unity::WindowList windows_;
+  std::string type_;
 
 
   virtual std::string icon() const { return icon_; }
   virtual std::string title() const { return title_; }
   virtual std::string desktop_file() const { return desktop_file_; }
-  virtual std::string type() const { return "mock"; }
+  virtual std::string type() const { return type_; }
   virtual std::string repr() const { return "MockApplication"; }
 
   virtual unity::WindowList GetWindows() const { return windows_; }
 
=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2013-04-08 18:19:46 +0000
+++ tests/test_application_launcher_icon.cpp	2013-04-26 14:21:59 +0000
@@ -525,4 +525,13 @@
   EXPECT_TRUE(icon->IsFileManager());
 }
 
+TEST_F(TestApplicationLauncherIcon, AllowDetailViewInSwitcher)
+{
+  mock_app->type_ = "mock";
+  EXPECT_TRUE(mock_icon->AllowDetailViewInSwitcher());
+
+  mock_app->type_ = "webapp";
+  EXPECT_FALSE(mock_icon->AllowDetailViewInSwitcher());
+}
+
 }
 
=== modified file 'tests/test_switcher_controller.cpp'
--- tests/test_switcher_controller.cpp	2013-03-19 01:13:43 +0000
+++ tests/test_switcher_controller.cpp	2013-04-26 14:21:59 +0000
@@ -63,6 +63,21 @@
   EXPECT_LT(model->detail_selection.changed.size(), prev_size);
 }
 
+TEST_F(TestSwitcherController, InitiateDetailWebapps)
+{
+  controller_->Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, icons_);
+
+  controller_->Select(3);
+  controller_->InitiateDetail();
+
+  auto const& view = controller_->GetView();
+  auto const& model = view->GetModel();
+  EXPECT_EQ(controller_->detail_mode(), DetailMode::TAB_NEXT_TILE);
+  EXPECT_FALSE(view->animate());
+  EXPECT_FALSE(model->detail_selection());
+}
+
+
 TEST_F(TestSwitcherController, ShowSwitcher)
 {
   EXPECT_FALSE(controller_->Visible());
 
=== modified file 'tests/test_switcher_controller.h'
--- tests/test_switcher_controller.h	2013-03-19 01:13:43 +0000
+++ tests/test_switcher_controller.h	2013-04-26 14:21:59 +0000
@@ -72,12 +72,14 @@
 class FakeLauncherIcon : public unity::launcher::SimpleLauncherIcon
 {
 public:
-  FakeLauncherIcon(std::string const& app_name, unsigned priority);
+  FakeLauncherIcon(std::string const& app_name, bool allow_detail_view, unsigned priority);
 
-  unity::WindowList Windows();
-  unsigned long long SwitcherPriority();
+  unity::WindowList Windows()override;
+  bool AllowDetailViewInSwitcher() const override;
+  unsigned long long SwitcherPriority() override;
 
 private:
+  bool allow_detail_view_;
   unsigned   priority_;
   unity::WindowList window_list;
 };
 
=== modified file 'tests/test_switcher_controller_class.cpp'
--- tests/test_switcher_controller_class.cpp	2013-03-19 01:13:43 +0000
+++ tests/test_switcher_controller_class.cpp	2013-04-26 14:21:59 +0000
@@ -37,8 +37,9 @@
 bool FakeApplicationWindow::Focus() const { return false; }
 void FakeApplicationWindow::Quit() const {}
 
-FakeLauncherIcon::FakeLauncherIcon(std::string const& app_name, unsigned priority)
+FakeLauncherIcon::FakeLauncherIcon(std::string const& app_name, bool allow_detail_view, unsigned priority)
   : launcher::SimpleLauncherIcon(IconType::APPLICATION)
+  , allow_detail_view_(allow_detail_view)
   , priority_(priority)
   , window_list{ std::make_shared<FakeApplicationWindow>(priority_ | 0x0001),
                  std::make_shared<FakeApplicationWindow>(priority_ | 0x0002) }
@@ -51,6 +52,11 @@
   return window_list;
 }
 
+bool FakeLauncherIcon::AllowDetailViewInSwitcher() const
+{
+  return allow_detail_view_;
+}
+
 unsigned long long FakeLauncherIcon::SwitcherPriority()
 {
   return 0xffffffff - priority_;
@@ -74,8 +80,10 @@
 
   icons_.push_back(launcher::AbstractLauncherIcon::Ptr(new launcher::DesktopLauncherIcon()));
 
-  FakeLauncherIcon* first_app = new FakeLauncherIcon("First", 0x0100);
+  FakeLauncherIcon* first_app = new FakeLauncherIcon("First", true, 0x0100);
   icons_.push_back(launcher::AbstractLauncherIcon::Ptr(first_app));
-  FakeLauncherIcon* second_app = new FakeLauncherIcon("Second", 0x0200);
+  FakeLauncherIcon* second_app = new FakeLauncherIcon("Second", true, 0x0200);
   icons_.push_back(launcher::AbstractLauncherIcon::Ptr(second_app));
+  FakeLauncherIcon* third_app = new FakeLauncherIcon("Third", false, 0x0300);
+  icons_.push_back(launcher::AbstractLauncherIcon::Ptr(third_app));
 }