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

Unified Diff: ash/display/display_manager.h

Issue 11360045: ash: Add RootWindowHostFactory class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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/display/display_manager.h
diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
index 292da15f898c56cde0745166b1aa001a83f3c70d..5292d36691d3720d20ff4e61ced988170119de0b 100644
--- a/ash/display/display_manager.h
+++ b/ash/display/display_manager.h
@@ -27,6 +27,7 @@ class DisplayManagerTestApi;
class SystemGestureEventFilterTest;
}
namespace internal {
+class DisplayManagerDelegate;
// DisplayManager maintains the current display configurations,
// and notifies observers when configuration changes.
@@ -36,7 +37,7 @@ namespace internal {
// if the root window is translated. crbug.com/119268.
class ASH_EXPORT DisplayManager : public aura::RootWindowObserver {
public:
- DisplayManager();
+ DisplayManager(DisplayManagerDelegate* delegate);
virtual ~DisplayManager();
// Used to emulate display change when run in a desktop environment instead
@@ -183,6 +184,8 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver {
// The mapping from the display ID to its internal data.
std::map<int64, DisplayInfo> display_info_;
+ DisplayManagerDelegate* delegate_;
+
DISALLOW_COPY_AND_ASSIGN(DisplayManager);
};
« no previous file with comments | « ash/ash.gyp ('k') | ash/display/display_manager.cc » ('j') | ui/aura/root_window.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698