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

Side by Side Diff: ash/shell.h

Issue 181563004: Remove --ash-disable-overview-mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master and update tests. Created 6 years, 9 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
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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 } 357 }
358 MruWindowTracker* mru_window_tracker() { 358 MruWindowTracker* mru_window_tracker() {
359 return mru_window_tracker_.get(); 359 return mru_window_tracker_.get();
360 } 360 }
361 UserActivityDetector* user_activity_detector() { 361 UserActivityDetector* user_activity_detector() {
362 return user_activity_detector_.get(); 362 return user_activity_detector_.get();
363 } 363 }
364 VideoDetector* video_detector() { 364 VideoDetector* video_detector() {
365 return video_detector_.get(); 365 return video_detector_.get();
366 } 366 }
367 WindowCycleController* window_cycle_controller() {
368 return window_cycle_controller_.get();
369 }
370 WindowSelectorController* window_selector_controller() { 367 WindowSelectorController* window_selector_controller() {
371 return window_selector_controller_.get(); 368 return window_selector_controller_.get();
372 } 369 }
373 internal::FocusCycler* focus_cycler() { 370 internal::FocusCycler* focus_cycler() {
374 return focus_cycler_.get(); 371 return focus_cycler_.get();
375 } 372 }
376 DisplayController* display_controller() { 373 DisplayController* display_controller() {
377 return display_controller_.get(); 374 return display_controller_.get();
378 } 375 }
379 internal::MouseCursorEventFilter* mouse_cursor_filter() { 376 internal::MouseCursorEventFilter* mouse_cursor_filter() {
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 646 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
650 scoped_ptr<views::corewm::WindowModalityController> 647 scoped_ptr<views::corewm::WindowModalityController>
651 window_modality_controller_; 648 window_modality_controller_;
652 scoped_ptr<views::corewm::TooltipController> tooltip_controller_; 649 scoped_ptr<views::corewm::TooltipController> tooltip_controller_;
653 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; 650 scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
654 scoped_ptr<PowerButtonController> power_button_controller_; 651 scoped_ptr<PowerButtonController> power_button_controller_;
655 scoped_ptr<LockStateController> lock_state_controller_; 652 scoped_ptr<LockStateController> lock_state_controller_;
656 scoped_ptr<MruWindowTracker> mru_window_tracker_; 653 scoped_ptr<MruWindowTracker> mru_window_tracker_;
657 scoped_ptr<UserActivityDetector> user_activity_detector_; 654 scoped_ptr<UserActivityDetector> user_activity_detector_;
658 scoped_ptr<VideoDetector> video_detector_; 655 scoped_ptr<VideoDetector> video_detector_;
659 scoped_ptr<WindowCycleController> window_cycle_controller_;
660 scoped_ptr<WindowSelectorController> window_selector_controller_; 656 scoped_ptr<WindowSelectorController> window_selector_controller_;
661 scoped_ptr<internal::FocusCycler> focus_cycler_; 657 scoped_ptr<internal::FocusCycler> focus_cycler_;
662 scoped_ptr<DisplayController> display_controller_; 658 scoped_ptr<DisplayController> display_controller_;
663 scoped_ptr<HighContrastController> high_contrast_controller_; 659 scoped_ptr<HighContrastController> high_contrast_controller_;
664 scoped_ptr<MagnificationController> magnification_controller_; 660 scoped_ptr<MagnificationController> magnification_controller_;
665 scoped_ptr<PartialMagnificationController> partial_magnification_controller_; 661 scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
666 scoped_ptr<AutoclickController> autoclick_controller_; 662 scoped_ptr<AutoclickController> autoclick_controller_;
667 scoped_ptr<aura::client::FocusClient> focus_client_; 663 scoped_ptr<aura::client::FocusClient> focus_client_;
668 aura::client::ActivationClient* activation_client_; 664 aura::client::ActivationClient* activation_client_;
669 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 665 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 740
745 // Injected content::GPUDataManager support. 741 // Injected content::GPUDataManager support.
746 scoped_ptr<GPUSupport> gpu_support_; 742 scoped_ptr<GPUSupport> gpu_support_;
747 743
748 DISALLOW_COPY_AND_ASSIGN(Shell); 744 DISALLOW_COPY_AND_ASSIGN(Shell);
749 }; 745 };
750 746
751 } // namespace ash 747 } // namespace ash
752 748
753 #endif // ASH_SHELL_H_ 749 #endif // ASH_SHELL_H_
OLDNEW
« ash/focus_cycler.cc ('K') | « ash/focus_cycler_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698