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

Unified Diff: ash/shell.cc

Issue 16463002: Change ordering of Shell event handlers: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | « ash/drag_drop/drag_drop_controller_unittest.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index b9aa55e4a581196a2da4d17ea321c53204157c5e..76b4638854bcab6404527e32d9abed9bade6ac70 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -537,14 +537,14 @@ void Shell::Init() {
lock_state_controller_.get()));
AddShellObserver(lock_state_controller_.get());
+ drag_drop_controller_.reset(new internal::DragDropController);
mouse_cursor_filter_.reset(new internal::MouseCursorEventFilter());
- AddPreTargetHandler(mouse_cursor_filter_.get());
+ PrependPreTargetHandler(mouse_cursor_filter_.get());
// Create Controllers that may need root window.
// TODO(oshima): Move as many controllers before creating
// RootWindowController as possible.
visibility_controller_.reset(new AshVisibilityController);
- drag_drop_controller_.reset(new internal::DragDropController);
user_action_client_.reset(delegate_->CreateUserActionClient());
window_modality_controller_.reset(
new views::corewm::WindowModalityController);
« no previous file with comments | « ash/drag_drop/drag_drop_controller_unittest.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698