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

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: Rebase 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
« no previous file with comments | « ash/magnifier/partial_magnification_controller.cc ('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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 62
63 namespace ash { 63 namespace ash {
64 64
65 class AcceleratorController; 65 class AcceleratorController;
66 class CapsLockDelegate; 66 class CapsLockDelegate;
67 class DesktopBackgroundController; 67 class DesktopBackgroundController;
68 class DisplayController; 68 class DisplayController;
69 class HighContrastController; 69 class HighContrastController;
70 class Launcher; 70 class Launcher;
71 class MagnificationController;
71 class NestedDispatcherController; 72 class NestedDispatcherController;
73 class PartialMagnificationController;
72 class PowerButtonController; 74 class PowerButtonController;
73 class ScreenAsh; 75 class ScreenAsh;
74 class SessionStateController; 76 class SessionStateController;
75 class ShellDelegate; 77 class ShellDelegate;
76 class ShellObserver; 78 class ShellObserver;
77 class SystemTray; 79 class SystemTray;
78 class SystemTrayDelegate; 80 class SystemTrayDelegate;
79 class SystemTrayNotifier; 81 class SystemTrayNotifier;
80 class UserActivityDetector; 82 class UserActivityDetector;
81 class UserWallpaperDelegate; 83 class UserWallpaperDelegate;
82 class VideoDetector; 84 class VideoDetector;
83 class WebNotificationTray; 85 class WebNotificationTray;
84 class WindowCycleController; 86 class WindowCycleController;
85 87
86 namespace internal { 88 namespace internal {
87 class AcceleratorFilter; 89 class AcceleratorFilter;
88 class ActivationController; 90 class ActivationController;
89 class AppListController; 91 class AppListController;
90 class CaptureController; 92 class CaptureController;
91 class DisplayChangeObserverX11; 93 class DisplayChangeObserverX11;
92 class DisplayManager; 94 class DisplayManager;
93 class DragDropController; 95 class DragDropController;
94 class EventClientImpl; 96 class EventClientImpl;
95 class EventRewriterEventFilter; 97 class EventRewriterEventFilter;
96 class FocusCycler; 98 class FocusCycler;
97 class MagnificationController;
98 class MouseCursorEventFilter; 99 class MouseCursorEventFilter;
99 class OutputConfiguratorAnimation; 100 class OutputConfiguratorAnimation;
100 class OverlayEventFilter; 101 class OverlayEventFilter;
101 class ResizeShadowController; 102 class ResizeShadowController;
102 class RootWindowController; 103 class RootWindowController;
103 class RootWindowLayoutManager; 104 class RootWindowLayoutManager;
104 class ScreenPositionController; 105 class ScreenPositionController;
105 class SlowAnimationEventFilter; 106 class SlowAnimationEventFilter;
106 class StatusAreaWidget; 107 class StatusAreaWidget;
107 class SystemGestureEventFilter; 108 class SystemGestureEventFilter;
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 } 317 }
317 318
318 CapsLockDelegate* caps_lock_delegate() { 319 CapsLockDelegate* caps_lock_delegate() {
319 return caps_lock_delegate_.get(); 320 return caps_lock_delegate_.get();
320 } 321 }
321 322
322 HighContrastController* high_contrast_controller() { 323 HighContrastController* high_contrast_controller() {
323 return high_contrast_controller_.get(); 324 return high_contrast_controller_.get();
324 } 325 }
325 326
326 internal::MagnificationController* magnification_controller() { 327 MagnificationController* magnification_controller() {
327 return magnification_controller_.get(); 328 return magnification_controller_.get();
328 } 329 }
329 330
331 PartialMagnificationController* partial_magnification_controller() {
332 return partial_magnification_controller_.get();
333 }
334
330 ScreenAsh* screen() { return screen_; } 335 ScreenAsh* screen() { return screen_; }
331 336
332 // Force the shelf to query for it's current visibility state. 337 // Force the shelf to query for it's current visibility state.
333 void UpdateShelfVisibility(); 338 void UpdateShelfVisibility();
334 339
335 // TODO(oshima): Define an interface to access shelf/launcher 340 // TODO(oshima): Define an interface to access shelf/launcher
336 // state, or just use Launcher. 341 // state, or just use Launcher.
337 342
338 // Sets/gets the shelf auto-hide behavior on |root_window|. 343 // Sets/gets the shelf auto-hide behavior on |root_window|.
339 void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior, 344 void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior,
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 scoped_ptr<internal::VisibilityController> visibility_controller_; 492 scoped_ptr<internal::VisibilityController> visibility_controller_;
488 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; 493 scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
489 scoped_ptr<PowerButtonController> power_button_controller_; 494 scoped_ptr<PowerButtonController> power_button_controller_;
490 scoped_ptr<SessionStateController> session_state_controller_; 495 scoped_ptr<SessionStateController> session_state_controller_;
491 scoped_ptr<UserActivityDetector> user_activity_detector_; 496 scoped_ptr<UserActivityDetector> user_activity_detector_;
492 scoped_ptr<VideoDetector> video_detector_; 497 scoped_ptr<VideoDetector> video_detector_;
493 scoped_ptr<WindowCycleController> window_cycle_controller_; 498 scoped_ptr<WindowCycleController> window_cycle_controller_;
494 scoped_ptr<internal::FocusCycler> focus_cycler_; 499 scoped_ptr<internal::FocusCycler> focus_cycler_;
495 scoped_ptr<DisplayController> display_controller_; 500 scoped_ptr<DisplayController> display_controller_;
496 scoped_ptr<HighContrastController> high_contrast_controller_; 501 scoped_ptr<HighContrastController> high_contrast_controller_;
497 scoped_ptr<internal::MagnificationController> magnification_controller_; 502 scoped_ptr<MagnificationController> magnification_controller_;
503 scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
498 scoped_ptr<aura::FocusManager> focus_manager_; 504 scoped_ptr<aura::FocusManager> focus_manager_;
499 scoped_ptr<aura::client::UserActionClient> user_action_client_; 505 scoped_ptr<aura::client::UserActionClient> user_action_client_;
500 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 506 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
501 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 507 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
502 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; 508 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
503 scoped_ptr<internal::EventClientImpl> event_client_; 509 scoped_ptr<internal::EventClientImpl> event_client_;
504 510
505 // An event filter that rewrites or drops an event. 511 // An event filter that rewrites or drops an event.
506 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; 512 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
507 513
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 551
546 // For testing only: simulate that a modal window is open 552 // For testing only: simulate that a modal window is open
547 bool simulate_modal_window_open_for_testing_; 553 bool simulate_modal_window_open_for_testing_;
548 554
549 DISALLOW_COPY_AND_ASSIGN(Shell); 555 DISALLOW_COPY_AND_ASSIGN(Shell);
550 }; 556 };
551 557
552 } // namespace ash 558 } // namespace ash
553 559
554 #endif // ASH_SHELL_H_ 560 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/magnifier/partial_magnification_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698