Add desktop vs. ash context to ui_controls

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index c150eb23818522e7ce38c017bb545a07f74405b4..93a6c2510c7f62b7282e3f62f0c2537aab0c5af6 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -75,7 +75,6 @@
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/ui_controls_aura.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
@@ -210,7 +209,9 @@ Shell::Shell(ShellDelegate* delegate)
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, screen_);
   if (!gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE))
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_);
-  ui_controls::InstallUIControlsAura(internal::CreateUIControls());
+  ui_controls::UIControls* uicontrols = internal::CreateUIControls();

[oshima, 2012/11/16 23:04:07]

nit: can this be in in argument list? If it
desn't fit 80 chars, this is fine.

[scottmg, 2012/11/16 23:10:29]

Done.

+  ui_controls::UIControls::SetUIControlsInstance(
+    ui_controls::UI_CONTROLS_TYPE_ALTERNATE, uicontrols);
 #if defined(OS_CHROMEOS)
   content::GpuFeatureType blacklisted_features =
       content::GpuDataManager::GetInstance()->GetBlacklistedFeatures();
@@ -228,6 +229,8 @@ Shell::Shell(ShellDelegate* delegate)
 
 Shell::~Shell() {
   views::FocusManagerFactory::Install(NULL);
+  ui_controls::UIControls::SetUIControlsInstance(
+      ui_controls::UI_CONTROLS_TYPE_ALTERNATE, NULL);
 
   // Remove the focus from any window. This will prevent overhead and side
   // effects (e.g. crashes) from changing focus during shutdown.