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

Unified Diff: ash/shell.h

Issue 1394573003: chromeos: Add SurfaceServiceProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 86382cd8806c079025e9822dfdcd9261c330fe32..806b176e9c6a3b4e9ea449c704c9ecbe2b84544f 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -136,6 +136,7 @@ class ShellObserver;
class SlowAnimationEventFilter;
class StatusAreaWidget;
class StickyKeysController;
+class SurfaceController;
class SystemGestureEventFilter;
class SystemModalContainerEventFilter;
class SystemTray;
@@ -521,6 +522,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return maximize_mode_controller_.get();
}
+ SurfaceController* surface_controller() { return surface_controller_.get(); }
+
#if defined(OS_CHROMEOS)
// TODO(oshima): Move these objects to WindowTreeHostManager.
ui::DisplayConfigurator* display_configurator() {
@@ -748,6 +751,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
scoped_ptr<MaximizeModeController> maximize_mode_controller_;
+ scoped_ptr<SurfaceController> surface_controller_;
+
// |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
// pointer to vend to test code.
AshNativeCursorManager* native_cursor_manager_;
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | chromeos/dbus/services/surface_service_provider.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698