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..2da612cecae9c5ee597592a6b16b6f3b3e256262 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_.reset(internal::CreateUIControls());
+  ui_controls::UIControls::SetUIControlsInstance(
+    ui_controls::UI_CONTROLS_TYPE_ALTERNATE, ui_controls_.get());
+  if (!ui_controls::UIControls::GetUIControlsByType(
+        ui_controls::UI_CONTROLS_TYPE_NATIVE)) {
+    ui_controls::UIControls::SetUIControlsInstance(
+        ui_controls::UI_CONTROLS_TYPE_NATIVE, ui_controls_.get());
+  }
 #if defined(OS_CHROMEOS)
   content::GpuFeatureType blacklisted_features =
       content::GpuDataManager::GetInstance()->GetBlacklistedFeatures();