Add desktop vs. ash context to ui_controls

content/shell/shell_aura.cc

Index: content/shell/shell_aura.cc
diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc
index 9e63d3305742e3baf250a702d21da2152acf8054..b2afa44f8f70f1678adcd1b950e38303bf34ad0a 100644
--- a/content/shell/shell_aura.cc
+++ b/content/shell/shell_aura.cc
@@ -6,6 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
+#include "ui/aura/desktop_ui_controls.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
@@ -14,6 +15,7 @@
 #include "ui/base/events/event.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/screen.h"
+#include "ui/ui_controls/ui_controls.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
@@ -289,6 +291,10 @@ void Shell::PlatformInitialize() {
   stacking_client_ = new views::DesktopStackingClient();
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, views::CreateDesktopScreen());
+  // TODO(scottmg): NULL RootWindow, http://crbug.com/128578
+  ui_controls::UIControls::SetUIControlsInstance(
+      ui_controls::UI_CONTROLS_TYPE_NATIVE,
+      aura::CreateDesktopUIControls(NULL));
 #endif
   aura::client::SetStackingClient(stacking_client_);
   views_delegate_ = new ShellViewsDelegateAura();