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

Unified Diff: ui/views/corewm/tooltip_controller_unittest.cc

Issue 250113002: Move DefaultActivationClient to wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | « ui/snapshot/snapshot_aura_unittest.cc ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/tooltip_controller_unittest.cc
diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc
index 4764fc7115e675f398c0832b629b287897846388..f09a2a0533e92f0f1d25e618914cbc56f33426d4 100644
--- a/ui/views/corewm/tooltip_controller_unittest.cc
+++ b/ui/views/corewm/tooltip_controller_unittest.cc
@@ -25,6 +25,7 @@
#include "ui/views/view.h"
#include "ui/views/widget/tooltip_manager.h"
#include "ui/views/widget/widget.h"
+#include "ui/wm/core/default_activation_client.h"
#include "ui/wm/core/wm_state.h"
#include "ui/wm/public/tooltip_client.h"
#include "ui/wm/public/window_types.h"
@@ -78,6 +79,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase {
virtual void SetUp() OVERRIDE {
wm_state_.reset(new wm::WMState);
aura::test::AuraTestBase::SetUp();
+ new wm::DefaultActivationClient(root_window());
#if defined(OS_CHROMEOS)
controller_.reset(new TooltipController(
scoped_ptr<views::corewm::Tooltip>(
@@ -698,6 +700,7 @@ class TooltipControllerTest2 : public aura::test::AuraTestBase {
virtual void SetUp() OVERRIDE {
wm_state_.reset(new wm::WMState);
aura::test::AuraTestBase::SetUp();
+ new wm::DefaultActivationClient(root_window());
controller_.reset(new TooltipController(
scoped_ptr<corewm::Tooltip>(test_tooltip_)));
root_window()->AddPreTargetHandler(controller_.get());
« no previous file with comments | « ui/snapshot/snapshot_aura_unittest.cc ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698