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

Side by Side Diff: ash/shell.h

Issue 10915140: Add the partial screen magnifier to Chrome OS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Code review fixes Created 8 years, 1 month 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
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 } 59 }
60 60
61 namespace ash { 61 namespace ash {
62 62
63 class AcceleratorController; 63 class AcceleratorController;
64 class CapsLockDelegate; 64 class CapsLockDelegate;
65 class DesktopBackgroundController; 65 class DesktopBackgroundController;
66 class DisplayController; 66 class DisplayController;
67 class HighContrastController; 67 class HighContrastController;
68 class Launcher; 68 class Launcher;
69 class MagnificationController;
69 class NestedDispatcherController; 70 class NestedDispatcherController;
71 class PartialMagnificationController;
70 class PowerButtonController; 72 class PowerButtonController;
71 class ScreenAsh; 73 class ScreenAsh;
72 class SessionStateController; 74 class SessionStateController;
73 class ShellDelegate; 75 class ShellDelegate;
74 class ShellObserver; 76 class ShellObserver;
75 class SystemTray; 77 class SystemTray;
76 class SystemTrayDelegate; 78 class SystemTrayDelegate;
77 class UserActivityDetector; 79 class UserActivityDetector;
78 class UserWallpaperDelegate; 80 class UserWallpaperDelegate;
79 class VideoDetector; 81 class VideoDetector;
80 class WebNotificationTray; 82 class WebNotificationTray;
81 class WindowCycleController; 83 class WindowCycleController;
82 84
83 namespace internal { 85 namespace internal {
84 class AcceleratorFilter; 86 class AcceleratorFilter;
85 class ActivationController; 87 class ActivationController;
86 class AppListController; 88 class AppListController;
87 class CaptureController; 89 class CaptureController;
88 class DragDropController; 90 class DragDropController;
89 class EventClientImpl; 91 class EventClientImpl;
90 class EventRewriterEventFilter; 92 class EventRewriterEventFilter;
91 class FocusCycler; 93 class FocusCycler;
92 class MagnificationController;
93 class MouseCursorEventFilter; 94 class MouseCursorEventFilter;
94 class OutputConfiguratorAnimation; 95 class OutputConfiguratorAnimation;
95 class OverlayEventFilter; 96 class OverlayEventFilter;
96 class ResizeShadowController; 97 class ResizeShadowController;
97 class RootWindowController; 98 class RootWindowController;
98 class RootWindowLayoutManager; 99 class RootWindowLayoutManager;
99 class ScreenPositionController; 100 class ScreenPositionController;
100 class ShadowController; 101 class ShadowController;
101 class SlowAnimationEventFilter; 102 class SlowAnimationEventFilter;
102 class StackingController; 103 class StackingController;
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 } 316 }
316 317
317 CapsLockDelegate* caps_lock_delegate() { 318 CapsLockDelegate* caps_lock_delegate() {
318 return caps_lock_delegate_.get(); 319 return caps_lock_delegate_.get();
319 } 320 }
320 321
321 HighContrastController* high_contrast_controller() { 322 HighContrastController* high_contrast_controller() {
322 return high_contrast_controller_.get(); 323 return high_contrast_controller_.get();
323 } 324 }
324 325
325 internal::MagnificationController* magnification_controller() { 326 MagnificationController* magnification_controller() {
326 return magnification_controller_.get(); 327 return magnification_controller_.get();
327 } 328 }
328 329
330 PartialMagnificationController* partial_magnification_controller() {
331 return partial_magnification_controller_.get();
332 }
333
329 const ScreenAsh* screen() { return screen_; } 334 const ScreenAsh* screen() { return screen_; }
330 335
331 // Force the shelf to query for it's current visibility state. 336 // Force the shelf to query for it's current visibility state.
332 void UpdateShelfVisibility(); 337 void UpdateShelfVisibility();
333 338
334 // TODO(oshima): Define an interface to access shelf/launcher 339 // TODO(oshima): Define an interface to access shelf/launcher
335 // state, or just use Launcher. 340 // state, or just use Launcher.
336 341
337 // Sets/gets the shelf auto-hide behavior on |root_window|. 342 // Sets/gets the shelf auto-hide behavior on |root_window|.
338 void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior, 343 void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior,
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 scoped_ptr<internal::VisibilityController> visibility_controller_; 484 scoped_ptr<internal::VisibilityController> visibility_controller_;
480 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; 485 scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
481 scoped_ptr<PowerButtonController> power_button_controller_; 486 scoped_ptr<PowerButtonController> power_button_controller_;
482 scoped_ptr<SessionStateController> session_state_controller_; 487 scoped_ptr<SessionStateController> session_state_controller_;
483 scoped_ptr<UserActivityDetector> user_activity_detector_; 488 scoped_ptr<UserActivityDetector> user_activity_detector_;
484 scoped_ptr<VideoDetector> video_detector_; 489 scoped_ptr<VideoDetector> video_detector_;
485 scoped_ptr<WindowCycleController> window_cycle_controller_; 490 scoped_ptr<WindowCycleController> window_cycle_controller_;
486 scoped_ptr<internal::FocusCycler> focus_cycler_; 491 scoped_ptr<internal::FocusCycler> focus_cycler_;
487 scoped_ptr<DisplayController> display_controller_; 492 scoped_ptr<DisplayController> display_controller_;
488 scoped_ptr<HighContrastController> high_contrast_controller_; 493 scoped_ptr<HighContrastController> high_contrast_controller_;
489 scoped_ptr<internal::MagnificationController> magnification_controller_; 494 scoped_ptr<MagnificationController> magnification_controller_;
495 scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
490 scoped_ptr<aura::FocusManager> focus_manager_; 496 scoped_ptr<aura::FocusManager> focus_manager_;
491 scoped_ptr<aura::client::UserActionClient> user_action_client_; 497 scoped_ptr<aura::client::UserActionClient> user_action_client_;
492 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 498 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
493 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 499 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
494 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; 500 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
495 scoped_ptr<internal::EventClientImpl> event_client_; 501 scoped_ptr<internal::EventClientImpl> event_client_;
496 502
497 // An event filter that rewrites or drops an event. 503 // An event filter that rewrites or drops an event.
498 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; 504 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
499 505
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 538
533 // For testing only: simulate that a modal window is open 539 // For testing only: simulate that a modal window is open
534 bool simulate_modal_window_open_for_testing_; 540 bool simulate_modal_window_open_for_testing_;
535 541
536 DISALLOW_COPY_AND_ASSIGN(Shell); 542 DISALLOW_COPY_AND_ASSIGN(Shell);
537 }; 543 };
538 544
539 } // namespace ash 545 } // namespace ash
540 546
541 #endif // ASH_SHELL_H_ 547 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698