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

Unified Diff: mojo/services/window_manager/main.cc

Issue 474883003: Move focus from the view manager to the window manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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
« no previous file with comments | « mojo/services/window_manager/DEPS ('k') | mojo/services/window_manager/window_manager_app.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/window_manager/main.cc
diff --git a/mojo/services/window_manager/main.cc b/mojo/services/window_manager/main.cc
index 9bc50e43fada2179bf983d6615d03da0ffb08142..6d8c019a48024baa90ef9237a3ec05472312408a 100644
--- a/mojo/services/window_manager/main.cc
+++ b/mojo/services/window_manager/main.cc
@@ -21,7 +21,7 @@ class DefaultWindowManager : public ApplicationDelegate,
public WindowManagerDelegate {
public:
DefaultWindowManager()
- : window_manager_app_(new WindowManagerApp(this)),
+ : window_manager_app_(new WindowManagerApp(this, this)),
view_manager_(NULL),
root_(NULL) {}
virtual ~DefaultWindowManager() {}
@@ -59,7 +59,7 @@ class DefaultWindowManager : public ApplicationDelegate,
view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>(
new mojo::ServiceProviderImpl).Pass());
}
- virtual void DispatchEvent(View* target, EventPtr event) MOJO_OVERRIDE {}
+ virtual void DispatchEvent(EventPtr event) MOJO_OVERRIDE {}
scoped_ptr<WindowManagerApp> window_manager_app_;
« no previous file with comments | « mojo/services/window_manager/DEPS ('k') | mojo/services/window_manager/window_manager_app.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698