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

Unified Diff: ash/shell.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/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 346c9775ba1373aec049ad65be55f02d9f403ae5..187441a57229b1182247a58604241796021ada3a 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -9,6 +9,7 @@
#include <vector>
#include "ash/ash_export.h"
+#include "ash/display/display_manager_delegate.h"
#include "ash/shelf_types.h"
#include "ash/system/user/login_status.h"
#include "ash/wm/cursor_manager.h"
@@ -125,6 +126,7 @@ class ShellTestApi;
// Upon creation, the Shell sets itself as the RootWindow's delegate, which
// takes ownership of the Shell.
class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
+ internal::DisplayManagerDelegate,
public ui::EventTarget {
public:
typedef std::vector<aura::RootWindow*> RootWindowList;
@@ -441,6 +443,9 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
virtual EventTarget* GetParentTarget() OVERRIDE;
virtual void OnEvent(ui::Event* event) OVERRIDE;
+ // ash::internal::DisplayManagerDelegate overrides:
+ virtual aura::RootWindowDelegate* CreateRootWindowDelegate() OVERRIDE;
+
static Shell* instance_;
// If set before the Shell is initialized, the mouse cursor will be hidden
« no previous file with comments | « ash/root_window_delegate_win.cc ('k') | ash/shell.cc » ('j') | ui/aura/root_window.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698