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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/magnifier/partial_magnification_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 7c0c281ff1f98a27105f6c5db1f72d74e99d4291..db67eb63785a6ee9998c6437d310fe73927e7ef1 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -68,7 +68,9 @@ class DesktopBackgroundController;
class DisplayController;
class HighContrastController;
class Launcher;
+class MagnificationController;
class NestedDispatcherController;
+class PartialMagnificationController;
class PowerButtonController;
class ScreenAsh;
class SessionStateController;
@@ -94,7 +96,6 @@ class DragDropController;
class EventClientImpl;
class EventRewriterEventFilter;
class FocusCycler;
-class MagnificationController;
class MouseCursorEventFilter;
class OutputConfiguratorAnimation;
class OverlayEventFilter;
@@ -323,10 +324,14 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
return high_contrast_controller_.get();
}
- internal::MagnificationController* magnification_controller() {
+ MagnificationController* magnification_controller() {
return magnification_controller_.get();
}
+ PartialMagnificationController* partial_magnification_controller() {
+ return partial_magnification_controller_.get();
+ }
+
ScreenAsh* screen() { return screen_; }
// Force the shelf to query for it's current visibility state.
@@ -494,7 +499,8 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
scoped_ptr<internal::FocusCycler> focus_cycler_;
scoped_ptr<DisplayController> display_controller_;
scoped_ptr<HighContrastController> high_contrast_controller_;
- scoped_ptr<internal::MagnificationController> magnification_controller_;
+ scoped_ptr<MagnificationController> magnification_controller_;
+ scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
scoped_ptr<aura::FocusManager> focus_manager_;
scoped_ptr<aura::client::UserActionClient> user_action_client_;
scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
« 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