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

Unified Diff: ash/shell.h

Issue 11087014: Revert 160696 - Decouple EventClientImpl and root window. Check containers on the same root window … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
===================================================================
--- ash/shell.h (revision 160706)
+++ ash/shell.h (working copy)
@@ -83,7 +83,6 @@
class AppListController;
class CaptureController;
class DragDropController;
-class EventClientImpl;
class EventRewriterEventFilter;
class FocusCycler;
class MagnificationController;
@@ -176,8 +175,6 @@
static aura::Window* GetContainer(aura::RootWindow* root_window,
int container_id);
- static const aura::Window* GetContainer(const aura::RootWindow* root_window,
- int container_id);
// Returns the list of containers that match |container_id| in
// all root windows.
@@ -460,7 +457,6 @@
scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
- scoped_ptr<internal::EventClientImpl> event_client_;
// An event filter that rewrites or drops an event.
scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698