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

Unified Diff: ui/aura/root_window.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
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.h
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index 06755667fb240b3e255fba9dde1abe87ac2d72df..399779504c05f2941fa74b24076e36368e28ca4f 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -48,6 +48,7 @@ class ViewProp;
namespace aura {
class RootWindow;
+class RootWindowDelegate;
class RootWindowHost;
class RootWindowObserver;
@@ -68,9 +69,10 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
gfx::Rect initial_bounds;
- // A host to use in place of the default one that RootWindow will create.
+ // RootWindow delegate. Can be used to create a host to use in place of the
+ // default one that RootWindow will create.
// NULL by default.
- RootWindowHost* host;
+ RootWindowDelegate* delegate;
Ben Goodger (Google) 2012/12/11 01:14:02 Why can't you just set host to the value you want?
reveman 2012/12/11 07:23:30 OK, I like this. We don't need RootWindowDelegate.
};
explicit RootWindow(const CreateParams& params);
@@ -351,6 +353,8 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
// current mouse location.
void SynthesizeMouseMoveEvent();
+ scoped_ptr<RootWindowDelegate> delegate_;
+
scoped_ptr<ui::Compositor> compositor_;
scoped_ptr<RootWindowHost> host_;
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698