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

Unified Diff: ash/root_window_controller.cc

Issue 11047030: Decouple EventClientImpl and root window. Check containers on the same root window as focused windo… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix type in event_filter_unittest Created 8 years, 2 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/root_window_controller.h ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 1f08095c117800193937ac9eb91515f6791486ac..b0a5b92bbb86e63cdfc1ff4fedf69b634a050f1a 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -13,7 +13,6 @@
#include "ash/shell_factory.h"
#include "ash/shell_window_ids.h"
#include "ash/wm/base_layout_manager.h"
-#include "ash/wm/event_client_impl.h"
#include "ash/wm/property_util.h"
#include "ash/wm/root_window_layout_manager.h"
#include "ash/wm/screen_dimmer.h"
@@ -144,8 +143,6 @@ namespace internal {
RootWindowController::RootWindowController(aura::RootWindow* root_window)
: root_window_(root_window) {
SetRootWindowController(root_window, this);
-
- event_client_.reset(new EventClientImpl(root_window));
screen_dimmer_.reset(new ScreenDimmer(root_window));
}
@@ -162,7 +159,6 @@ void RootWindowController::Shutdown() {
NULL : Shell::GetPrimaryRootWindow());
}
SetRootWindowController(root_window_.get(), NULL);
- event_client_.reset();
screen_dimmer_.reset();
workspace_controller_.reset();
// Forget with the display ID so that display lookup
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698