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

Unified Diff: mojo/examples/wm_flow/wm/wm.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/examples/window_manager/window_manager.cc ('k') | mojo/mojo_examples.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/wm_flow/wm/wm.cc
diff --git a/mojo/examples/wm_flow/wm/wm.cc b/mojo/examples/wm_flow/wm/wm.cc
index 1832e360ff989229564aa74be0fa06fe62781b8c..023c44b4f400385d7ae7e9891af0daad9c5e0284 100644
--- a/mojo/examples/wm_flow/wm/wm.cc
+++ b/mojo/examples/wm_flow/wm/wm.cc
@@ -16,7 +16,7 @@ class SimpleWM : public mojo::ApplicationDelegate,
public mojo::WindowManagerDelegate {
public:
SimpleWM()
- : window_manager_app_(new mojo::WindowManagerApp(this)),
+ : window_manager_app_(new mojo::WindowManagerApp(this, this)),
view_manager_(NULL),
root_(NULL),
window_container_(NULL),
@@ -42,7 +42,6 @@ class SimpleWM : public mojo::ApplicationDelegate,
scoped_ptr<mojo::ServiceProvider> remote_service_provider) MOJO_OVERRIDE {
view_manager_ = view_manager;
root_ = root;
- view_manager_->SetWindowManagerDelegate(this);
window_container_ = mojo::View::Create(view_manager_);
window_container_->SetBounds(root_->bounds());
@@ -72,10 +71,7 @@ class SimpleWM : public mojo::ApplicationDelegate,
new mojo::ServiceProviderImpl).Pass());
next_window_origin_.Offset(50, 50);
}
- virtual void DispatchEvent(mojo::View* target,
- mojo::EventPtr event) MOJO_OVERRIDE {
- view_manager_->DispatchEvent(target, event.Pass());
- }
+ virtual void DispatchEvent(mojo::EventPtr event) MOJO_OVERRIDE {}
scoped_ptr<mojo::WindowManagerApp> window_manager_app_;
« no previous file with comments | « mojo/examples/window_manager/window_manager.cc ('k') | mojo/mojo_examples.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698