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

Unified Diff: trunk/src/ui/views/test/views_test_base.cc

Issue 259103003: Revert 266616 "Move DefaultActivationClient to wm/core" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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 | « trunk/src/ui/snapshot/snapshot_aura_unittest.cc ('k') | trunk/src/ui/wm/core/default_activation_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/test/views_test_base.cc
===================================================================
--- trunk/src/ui/views/test/views_test_base.cc (revision 266631)
+++ trunk/src/ui/views/test/views_test_base.cc (working copy)
@@ -12,7 +12,6 @@
#include "ui/aura/window_event_dispatcher.h"
#include "ui/compositor/test/context_factories_for_test.h"
#include "ui/wm/core/capture_controller.h"
-#include "ui/wm/core/default_activation_client.h"
#include "ui/wm/core/wm_state.h"
namespace views {
@@ -40,7 +39,6 @@
aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
aura_test_helper_->SetUp();
- new wm::DefaultActivationClient(aura_test_helper_->root_window());
wm_state_.reset(new ::wm::WMState);
ui::InitializeInputMethodForTesting();
}
« no previous file with comments | « trunk/src/ui/snapshot/snapshot_aura_unittest.cc ('k') | trunk/src/ui/wm/core/default_activation_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698