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..e8dc5428deedb243a227a50b066097b4218d8aac 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,14 @@ 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();
+  ANNOTATE_LEAKING_OBJECT_PTR(uicontrols);

[oshima, 2012/11/15 23:37:41]

Isn't it possible to delete old one in SetUIControlsInstance?

[scottmg, 2012/11/16 17:58:54]

Done.

+  ui_controls::UIControls::SetUIControlsInstance(
+    ui_controls::UI_CONTROLS_TYPE_ALTERNATE, uicontrols);
+  if (!ui_controls::UIControls::GetUIControlsByType(
+        ui_controls::UI_CONTROLS_TYPE_NATIVE))
+    ui_controls::UIControls::SetUIControlsInstance(
+        ui_controls::UI_CONTROLS_TYPE_NATIVE, uicontrols);

[oshima, 2012/11/15 23:37:41]

you need {} in this case.

[scottmg, 2012/11/16 17:58:54]

Done.

 #if defined(OS_CHROMEOS)
   content::GpuFeatureType blacklisted_features =
       content::GpuDataManager::GetInstance()->GetBlacklistedFeatures();