Add desktop vs. ash context to ui_controls

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 32 matching lines @@
 }
 
 namespace gfx {
 class ImageSkia;
 class Point;
 class Rect;
 }
 namespace ui {
 class Layer;
 }
+namespace ui_controls {
+class UIControls;
+}
 namespace views {
 class NonClientFrameView;
 class Widget;
 namespace corewm {
 class CompoundEventFilter;
 class InputMethodEventFilter;
 class ShadowController;
 }
 }
 
@@ skipping 389 matching lines @@
   virtual EventTarget* GetParentTarget() OVERRIDE;
 
   static Shell* instance_;
 
   // If set before the Shell is initialized, the mouse cursor will be hidden
   // when the screen is initially created.
   static bool initially_hide_cursor_;
 
   ScreenAsh* screen_;
 
+  scoped_ptr<ui_controls::UIControls> ui_controls_;
+
   // Active root window. Never becomes NULL during the session.
   aura::RootWindow* active_root_window_;
 
   // The CompoundEventFilter owned by aura::Env object.
   scoped_ptr<views::corewm::CompoundEventFilter> env_filter_;
 
   std::vector<WindowAndBoundsPair> to_restore_;
 
 #if !defined(OS_MACOSX)
   scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
@@ skipping 79 matching lines @@
 
   // For testing only: simulate that a modal window is open
   bool simulate_modal_window_open_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_