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

Unified Diff: ui/aura_shell/toplevel_window_event_filter_unittest.cc

Issue 8916020: Second attempt at moving the StackingClient to a property on the RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 | « ui/aura_shell/stacking_controller.cc ('k') | ui/aura_shell/workspace/workspace_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/toplevel_window_event_filter_unittest.cc
===================================================================
--- ui/aura_shell/toplevel_window_event_filter_unittest.cc (revision 114527)
+++ ui/aura_shell/toplevel_window_event_filter_unittest.cc (working copy)
@@ -9,7 +9,6 @@
#include "ui/aura/root_window.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/test/event_generator.h"
-#include "ui/aura/test/test_stacking_client.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura_shell/toplevel_window_event_filter.h"
#include "ui/aura_shell/window_util.h"
@@ -67,12 +66,8 @@
virtual void SetUp() OVERRIDE {
aura::test::AuraTestBase::SetUp();
- aura::Window* default_container =
- static_cast<aura::test::TestStackingClient*>(
- aura::RootWindow::GetInstance()->stacking_client())->
- default_container();
- default_container->SetEventFilter(
- new ToplevelWindowEventFilter(default_container));
+ aura::RootWindow::GetInstance()->SetEventFilter(
+ new ToplevelWindowEventFilter(aura::RootWindow::GetInstance()));
}
protected:
« no previous file with comments | « ui/aura_shell/stacking_controller.cc ('k') | ui/aura_shell/workspace/workspace_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698