Add desktop vs. ash context to ui_controls

chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
index 4c5dff59d847b04c4c038d29c10f3f077ec2d8a1..e37c9a84781eea38f38af352558116db70064b6b 100644
--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
@@ -7,8 +7,10 @@
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/toolkit_extra_parts.h"
 #include "chrome/browser/ui/aura/stacking_client_aura.h"
+#include "ui/aura/desktop_ui_controls.h"
 #include "ui/aura/env.h"
 #include "ui/gfx/screen.h"
+#include "ui/ui_controls/ui_controls.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/views/widget/desktop_aura/desktop_stacking_client.h"
 #include "ui/views/widget/native_widget_aura.h"
@@ -37,6 +39,10 @@ void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
   {
     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));
     stacking_client_.reset(new views::DesktopStackingClient);
     aura::client::SetStackingClient(stacking_client_.get());
   }