Index: ash/shell.cc |
=================================================================== |
--- ash/shell.cc (revision 160706) |
+++ ash/shell.cc (working copy) |
@@ -256,7 +256,6 @@ |
resize_shadow_controller_.reset(); |
shadow_controller_.reset(); |
tooltip_controller_.reset(); |
- event_client_.reset(); |
window_cycle_controller_.reset(); |
capture_controller_.reset(); |
nested_dispatcher_controller_.reset(); |
@@ -349,12 +348,6 @@ |
} |
// static |
-const aura::Window* Shell::GetContainer(const aura::RootWindow* root_window, |
- int container_id) { |
- return root_window->GetChildById(container_id); |
-} |
- |
-// static |
std::vector<aura::Window*> Shell::GetAllContainers(int container_id) { |
std::vector<aura::Window*> containers; |
aura::Window* container = GetPrimaryRootWindow()->GetChildById(container_id); |
@@ -455,8 +448,6 @@ |
drag_drop_controller_.get())); |
AddEnvEventFilter(tooltip_controller_.get()); |
- event_client_.reset(new internal::EventClientImpl); |
- |
InitRootWindowController(root_window_controller); |
// This controller needs to be set before SetupManagedWindowMode. |
@@ -740,7 +731,6 @@ |
screen_position_controller_.get()); |
aura::client::SetCursorClient(root_window, &cursor_manager_); |
aura::client::SetTooltipClient(root_window, tooltip_controller_.get()); |
- aura::client::SetEventClient(root_window, event_client_.get()); |
if (nested_dispatcher_controller_.get()) { |
aura::client::SetDispatcherClient(root_window, |