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

Side by Side Diff: ash/shell.h

Issue 15974008: Rename SessionStateController -> LockStateController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/ash.gyp ('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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 class HighContrastController; 77 class HighContrastController;
78 class Launcher; 78 class Launcher;
79 class LauncherDelegate; 79 class LauncherDelegate;
80 class LauncherModel; 80 class LauncherModel;
81 class MagnificationController; 81 class MagnificationController;
82 class NestedDispatcherController; 82 class NestedDispatcherController;
83 class PartialMagnificationController; 83 class PartialMagnificationController;
84 class PowerButtonController; 84 class PowerButtonController;
85 class RootWindowHostFactory; 85 class RootWindowHostFactory;
86 class ScreenAsh; 86 class ScreenAsh;
87 class SessionStateController; 87 class LockStateController;
88 class SessionStateDelegate; 88 class SessionStateDelegate;
89 class ShellDelegate; 89 class ShellDelegate;
90 class ShellObserver; 90 class ShellObserver;
91 class SystemTray; 91 class SystemTray;
92 class SystemTrayDelegate; 92 class SystemTrayDelegate;
93 class SystemTrayNotifier; 93 class SystemTrayNotifier;
94 class UserActivityDetector; 94 class UserActivityDetector;
95 class UserWallpaperDelegate; 95 class UserWallpaperDelegate;
96 class VideoDetector; 96 class VideoDetector;
97 class WebNotificationTray; 97 class WebNotificationTray;
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 } 302 }
303 internal::OverlayEventFilter* overlay_filter() { 303 internal::OverlayEventFilter* overlay_filter() {
304 return overlay_filter_.get(); 304 return overlay_filter_.get();
305 } 305 }
306 DesktopBackgroundController* desktop_background_controller() { 306 DesktopBackgroundController* desktop_background_controller() {
307 return desktop_background_controller_.get(); 307 return desktop_background_controller_.get();
308 } 308 }
309 PowerButtonController* power_button_controller() { 309 PowerButtonController* power_button_controller() {
310 return power_button_controller_.get(); 310 return power_button_controller_.get();
311 } 311 }
312 SessionStateController* session_state_controller() { 312 LockStateController* lock_state_controller() {
313 return session_state_controller_.get(); 313 return lock_state_controller_.get();
314 } 314 }
315 UserActivityDetector* user_activity_detector() { 315 UserActivityDetector* user_activity_detector() {
316 return user_activity_detector_.get(); 316 return user_activity_detector_.get();
317 } 317 }
318 VideoDetector* video_detector() { 318 VideoDetector* video_detector() {
319 return video_detector_.get(); 319 return video_detector_.get();
320 } 320 }
321 WindowCycleController* window_cycle_controller() { 321 WindowCycleController* window_cycle_controller() {
322 return window_cycle_controller_.get(); 322 return window_cycle_controller_.get();
323 } 323 }
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 scoped_ptr<internal::CaptureController> capture_controller_; 530 scoped_ptr<internal::CaptureController> capture_controller_;
531 scoped_ptr<internal::DragDropController> drag_drop_controller_; 531 scoped_ptr<internal::DragDropController> drag_drop_controller_;
532 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_; 532 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
533 scoped_ptr<views::corewm::ShadowController> shadow_controller_; 533 scoped_ptr<views::corewm::ShadowController> shadow_controller_;
534 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; 534 scoped_ptr<views::corewm::VisibilityController> visibility_controller_;
535 scoped_ptr<views::corewm::WindowModalityController> 535 scoped_ptr<views::corewm::WindowModalityController>
536 window_modality_controller_; 536 window_modality_controller_;
537 scoped_ptr<views::corewm::TooltipController> tooltip_controller_; 537 scoped_ptr<views::corewm::TooltipController> tooltip_controller_;
538 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; 538 scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
539 scoped_ptr<PowerButtonController> power_button_controller_; 539 scoped_ptr<PowerButtonController> power_button_controller_;
540 scoped_ptr<SessionStateController> session_state_controller_; 540 scoped_ptr<LockStateController> lock_state_controller_;
541 scoped_ptr<UserActivityDetector> user_activity_detector_; 541 scoped_ptr<UserActivityDetector> user_activity_detector_;
542 scoped_ptr<VideoDetector> video_detector_; 542 scoped_ptr<VideoDetector> video_detector_;
543 scoped_ptr<WindowCycleController> window_cycle_controller_; 543 scoped_ptr<WindowCycleController> window_cycle_controller_;
544 scoped_ptr<internal::FocusCycler> focus_cycler_; 544 scoped_ptr<internal::FocusCycler> focus_cycler_;
545 scoped_ptr<DisplayController> display_controller_; 545 scoped_ptr<DisplayController> display_controller_;
546 scoped_ptr<HighContrastController> high_contrast_controller_; 546 scoped_ptr<HighContrastController> high_contrast_controller_;
547 scoped_ptr<MagnificationController> magnification_controller_; 547 scoped_ptr<MagnificationController> magnification_controller_;
548 scoped_ptr<PartialMagnificationController> partial_magnification_controller_; 548 scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
549 scoped_ptr<aura::client::FocusClient> focus_client_; 549 scoped_ptr<aura::client::FocusClient> focus_client_;
550 scoped_ptr<aura::client::UserActionClient> user_action_client_; 550 scoped_ptr<aura::client::UserActionClient> user_action_client_;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 601
602 // For testing only: simulate that a modal window is open 602 // For testing only: simulate that a modal window is open
603 bool simulate_modal_window_open_for_testing_; 603 bool simulate_modal_window_open_for_testing_;
604 604
605 DISALLOW_COPY_AND_ASSIGN(Shell); 605 DISALLOW_COPY_AND_ASSIGN(Shell);
606 }; 606 };
607 607
608 } // namespace ash 608 } // namespace ash
609 609
610 #endif // ASH_SHELL_H_ 610 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698