Merge lp:~brandontschaefer/unity/skip-switcher-lazy-loading-timer into lp:unity

[Brandon Schaefer]

Comment out the lazy loading timer for the switcher, as we need real timing data to suggest this is necessary.

=== Problem ===
The switcher controller has a default 20 second delay to creating the window for it...this leads to windows losing focus when this happens. We really need to know if this is worthwhile to add all the complexity to check if the view has been created, when we will have to create it at some point anyway....so we need real timing data to suggest this.

=== Fix ===
Comment out the timer, and added a TODO (which will be happening soon).

[Stephen M. Webb (bregma)]

Yes.

review: Approve

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2012-11-23 04:05:35 +0000
+++ launcher/SwitcherController.cpp	2013-01-08 20:34:22 +0000
@@ -57,7 +57,8 @@
 {
   ubus_manager_.RegisterInterest(UBUS_BACKGROUND_COLOR_CHANGED, sigc::mem_fun(this, &Controller::OnBackgroundUpdate));
 
-  sources_.AddTimeoutSeconds(construct_timeout_, [&] { ConstructWindow(); return false; }, LAZY_TIMEOUT);
+  // TODO We need to get actual timing data to suggest this is necessary.
+  //sources_.AddTimeoutSeconds(construct_timeout_, [&] { ConstructWindow(); return false; }, LAZY_TIMEOUT);
 }
 
 void Controller::OnBackgroundUpdate(GVariant* data)

=== modified file 'tests/test_switcher_controller.cpp'
--- tests/test_switcher_controller.cpp	2012-11-06 18:19:09 +0000
+++ tests/test_switcher_controller.cpp	2013-01-08 20:34:22 +0000
@@ -106,6 +106,7 @@
   EXPECT_EQ(controller.GetConstructTimeout(), DEFAULT_LAZY_CONSTRUCT_TIMEOUT);
 }
 
+/*
 TEST(TestSwitcherController, LazyWindowConstruction)
 {
   // Setting the timeout to a lower value to speed-up the test
@@ -123,6 +124,7 @@
   Utils::WaitUntil(controller.window_constructed_, controller.GetConstructTimeout() + 1);
   EXPECT_TRUE(controller.window_constructed_);
 }
+*/
 
 TEST(TestSwitcherController, InitialDetailTimeout)
 {