Revert 245010 "Inject GPUDataManager support into ash to abstrac..."

trunk/src/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 65 matching lines @@
 namespace ash {
 
 class AcceleratorController;
 class AccessibilityDelegate;
 class AshNativeCursorManager;
 class AutoclickController;
 class CapsLockDelegate;
 class DesktopBackgroundController;
 class DisplayController;
 class FirstRunHelper;
-class GPUSupport;
 class HighContrastController;
 class LockStateController;
 class MagnificationController;
 class MediaDelegate;
 class MruWindowTracker;
 class NestedDispatcherController;
 class NewWindowDelegate;
 class PartialMagnificationController;
 class PowerButtonController;
 class WindowTreeHostFactory;
@@ skipping 432 matching lines @@
 #if defined(OS_CHROMEOS)
   // Creates instance of FirstRunHelper. Caller is responsible for deleting
   // returned object.
   ash::FirstRunHelper* CreateFirstRunHelper();
 
   StickyKeysController* sticky_keys_controller() {
     return sticky_keys_controller_.get();
   }
 #endif  // defined(OS_CHROMEOS)
 
-  GPUSupport* gpu_support() { return gpu_support_.get(); }
-  void SetGPUSupport(scoped_ptr<GPUSupport> gpu_support);
-
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
   friend class internal::RootWindowController;
   friend class internal::ScopedTargetRootWindow;
   friend class test::ShellTestApi;
   friend class shell::WindowWatcher;
 
   typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
@@ skipping 152 matching lines @@
   AshNativeCursorManager* native_cursor_manager_;
   views::corewm::CursorManager cursor_manager_;
 
   ObserverList<ShellObserver> observers_;
 
   // For testing only: simulate that a modal window is open
   bool simulate_modal_window_open_for_testing_;
 
   bool is_touch_hud_projection_enabled_;
 
-  // Injected content::GPUDataManager support.
-  scoped_ptr<GPUSupport> gpu_support_;
-
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_