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

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, 3 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
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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 class AppListController; 82 class AppListController;
83 class CaptureController; 83 class CaptureController;
84 class DragDropController; 84 class DragDropController;
85 class EventRewriterEventFilter; 85 class EventRewriterEventFilter;
86 class FocusCycler; 86 class FocusCycler;
87 class MagnificationController; 87 class MagnificationController;
88 class MouseCursorEventFilter; 88 class MouseCursorEventFilter;
89 class OutputConfiguratorAnimation; 89 class OutputConfiguratorAnimation;
90 class OverlayEventFilter; 90 class OverlayEventFilter;
91 class PanelLayoutManager; 91 class PanelLayoutManager;
92 class PartialMagnificationController;
92 class ResizeShadowController; 93 class ResizeShadowController;
93 class RootWindowController; 94 class RootWindowController;
94 class RootWindowLayoutManager; 95 class RootWindowLayoutManager;
95 class ScreenPositionController; 96 class ScreenPositionController;
96 class ShadowController; 97 class ShadowController;
97 class ShelfLayoutManager; 98 class ShelfLayoutManager;
98 class ShellContextMenu; 99 class ShellContextMenu;
99 class SlowAnimationEventFilter; 100 class SlowAnimationEventFilter;
100 class StackingController; 101 class StackingController;
101 class StatusAreaWidget; 102 class StatusAreaWidget;
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 } 294 }
294 295
295 HighContrastController* high_contrast_controller() { 296 HighContrastController* high_contrast_controller() {
296 return high_contrast_controller_.get(); 297 return high_contrast_controller_.get();
297 } 298 }
298 299
299 internal::MagnificationController* magnification_controller() { 300 internal::MagnificationController* magnification_controller() {
300 return magnification_controller_.get(); 301 return magnification_controller_.get();
301 } 302 }
302 303
304 internal::PartialMagnificationController* partial_magnification_controller() {
305 return partial_magnification_controller_.get();
306 }
307
303 Launcher* launcher() { return launcher_.get(); } 308 Launcher* launcher() { return launcher_.get(); }
304 309
305 const ScreenAsh* screen() { return screen_; } 310 const ScreenAsh* screen() { return screen_; }
306 311
307 // Force the shelf to query for it's current visibility state. 312 // Force the shelf to query for it's current visibility state.
308 void UpdateShelfVisibility(); 313 void UpdateShelfVisibility();
309 314
310 // Sets/gets the shelf auto-hide behavior. 315 // Sets/gets the shelf auto-hide behavior.
311 void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior); 316 void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior);
312 ShelfAutoHideBehavior GetShelfAutoHideBehavior() const; 317 ShelfAutoHideBehavior GetShelfAutoHideBehavior() const;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 scoped_ptr<internal::VisibilityController> visibility_controller_; 431 scoped_ptr<internal::VisibilityController> visibility_controller_;
427 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; 432 scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
428 scoped_ptr<PowerButtonController> power_button_controller_; 433 scoped_ptr<PowerButtonController> power_button_controller_;
429 scoped_ptr<UserActivityDetector> user_activity_detector_; 434 scoped_ptr<UserActivityDetector> user_activity_detector_;
430 scoped_ptr<VideoDetector> video_detector_; 435 scoped_ptr<VideoDetector> video_detector_;
431 scoped_ptr<WindowCycleController> window_cycle_controller_; 436 scoped_ptr<WindowCycleController> window_cycle_controller_;
432 scoped_ptr<internal::FocusCycler> focus_cycler_; 437 scoped_ptr<internal::FocusCycler> focus_cycler_;
433 scoped_ptr<DisplayController> display_controller_; 438 scoped_ptr<DisplayController> display_controller_;
434 scoped_ptr<HighContrastController> high_contrast_controller_; 439 scoped_ptr<HighContrastController> high_contrast_controller_;
435 scoped_ptr<internal::MagnificationController> magnification_controller_; 440 scoped_ptr<internal::MagnificationController> magnification_controller_;
441 scoped_ptr<internal::PartialMagnificationController>
442 partial_magnification_controller_;
436 scoped_ptr<aura::FocusManager> focus_manager_; 443 scoped_ptr<aura::FocusManager> focus_manager_;
437 scoped_ptr<aura::client::UserActionClient> user_action_client_; 444 scoped_ptr<aura::client::UserActionClient> user_action_client_;
438 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 445 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
439 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 446 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
440 447
441 // An event filter that rewrites or drops an event. 448 // An event filter that rewrites or drops an event.
442 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; 449 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
443 450
444 // An event filter that pre-handles key events while the partial 451 // An event filter that pre-handles key events while the partial
445 // screenshot UI or the keyboard overlay is active. 452 // screenshot UI or the keyboard overlay is active.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 491
485 // Used by ash/shell. 492 // Used by ash/shell.
486 content::BrowserContext* browser_context_; 493 content::BrowserContext* browser_context_;
487 494
488 DISALLOW_COPY_AND_ASSIGN(Shell); 495 DISALLOW_COPY_AND_ASSIGN(Shell);
489 }; 496 };
490 497
491 } // namespace ash 498 } // namespace ash
492 499
493 #endif // ASH_SHELL_H_ 500 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698