Move automation/ui_controls to ui/ui_controls

ash/shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 47 matching lines @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/monitor.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/ui_controls_aura.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/size.h"
+#include "ui/ui_controls/ui_controls.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
 #if !defined(OS_MACOSX)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/accelerators/nested_dispatcher_controller.h"
 #endif
 
 namespace ash {
@@ skipping 304 matching lines @@
     : root_window_(new aura::RootWindow),
       screen_(new ScreenAsh(root_window_.get())),
       root_filter_(NULL),
       delegate_(delegate),
       shelf_(NULL),
       root_window_layout_(NULL),
       status_widget_(NULL) {
   aura::Env::GetInstance()->SetMonitorManager(
       aura::CreateSingleMonitorManager(root_window_.get()));
   gfx::Screen::SetInstance(screen_);
+  ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));
 }
 
 Shell::~Shell() {
   RemoveRootWindowEventFilter(partial_screenshot_filter_.get());
   RemoveRootWindowEventFilter(input_method_filter_.get());
   RemoveRootWindowEventFilter(window_modality_controller_.get());
 #if !defined(OS_MACOSX)
   RemoveRootWindowEventFilter(accelerator_filter_.get());
 #endif
 
@@ skipping 307 matching lines @@
   // Create the desktop background image.
   desktop_background_controller_->SetDefaultDesktopBackgroundImage();
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash