Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: ash/shell.h

Issue 138223004: Inject GPUDataManager support into ash to abstract a content dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/screensaver/screensaver_view.h ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 namespace ash { 76 namespace ash {
77 77
78 class AcceleratorController; 78 class AcceleratorController;
79 class AccessibilityDelegate; 79 class AccessibilityDelegate;
80 class AshNativeCursorManager; 80 class AshNativeCursorManager;
81 class AutoclickController; 81 class AutoclickController;
82 class CapsLockDelegate; 82 class CapsLockDelegate;
83 class DesktopBackgroundController; 83 class DesktopBackgroundController;
84 class DisplayController; 84 class DisplayController;
85 class FirstRunHelper; 85 class FirstRunHelper;
86 class GPUSupport;
86 class HighContrastController; 87 class HighContrastController;
87 class LockStateController; 88 class LockStateController;
88 class MagnificationController; 89 class MagnificationController;
89 class MediaDelegate; 90 class MediaDelegate;
90 class MruWindowTracker; 91 class MruWindowTracker;
91 class NestedDispatcherController; 92 class NestedDispatcherController;
92 class NewWindowDelegate; 93 class NewWindowDelegate;
93 class PartialMagnificationController; 94 class PartialMagnificationController;
94 class PowerButtonController; 95 class PowerButtonController;
95 class WindowTreeHostFactory; 96 class WindowTreeHostFactory;
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 #if defined(OS_CHROMEOS) 529 #if defined(OS_CHROMEOS)
529 // Creates instance of FirstRunHelper. Caller is responsible for deleting 530 // Creates instance of FirstRunHelper. Caller is responsible for deleting
530 // returned object. 531 // returned object.
531 ash::FirstRunHelper* CreateFirstRunHelper(); 532 ash::FirstRunHelper* CreateFirstRunHelper();
532 533
533 StickyKeysController* sticky_keys_controller() { 534 StickyKeysController* sticky_keys_controller() {
534 return sticky_keys_controller_.get(); 535 return sticky_keys_controller_.get();
535 } 536 }
536 #endif // defined(OS_CHROMEOS) 537 #endif // defined(OS_CHROMEOS)
537 538
539 GPUSupport* gpu_support() { return gpu_support_.get(); }
540 void SetGPUSupport(scoped_ptr<GPUSupport> gpu_support);
541
538 private: 542 private:
539 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 543 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
540 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 544 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
541 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 545 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
542 friend class internal::RootWindowController; 546 friend class internal::RootWindowController;
543 friend class internal::ScopedTargetRootWindow; 547 friend class internal::ScopedTargetRootWindow;
544 friend class test::ShellTestApi; 548 friend class test::ShellTestApi;
545 friend class shell::WindowWatcher; 549 friend class shell::WindowWatcher;
546 550
547 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; 551 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 AshNativeCursorManager* native_cursor_manager_; 704 AshNativeCursorManager* native_cursor_manager_;
701 views::corewm::CursorManager cursor_manager_; 705 views::corewm::CursorManager cursor_manager_;
702 706
703 ObserverList<ShellObserver> observers_; 707 ObserverList<ShellObserver> observers_;
704 708
705 // For testing only: simulate that a modal window is open 709 // For testing only: simulate that a modal window is open
706 bool simulate_modal_window_open_for_testing_; 710 bool simulate_modal_window_open_for_testing_;
707 711
708 bool is_touch_hud_projection_enabled_; 712 bool is_touch_hud_projection_enabled_;
709 713
714 // Injected content::GPUDataManager support.
715 scoped_ptr<GPUSupport> gpu_support_;
716
710 DISALLOW_COPY_AND_ASSIGN(Shell); 717 DISALLOW_COPY_AND_ASSIGN(Shell);
711 }; 718 };
712 719
713 } // namespace ash 720 } // namespace ash
714 721
715 #endif // ASH_SHELL_H_ 722 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/screensaver/screensaver_view.h ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698