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

Unified Diff: ui/views/test/views_test_helper_aura.cc

Issue 2453953003: Moves TransientWindowClient to ui/aura/client and adds observer (Closed)
Patch Set: merge Created 4 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 | « ui/views/test/views_test_helper_aura.h ('k') | ui/wm/core/easy_resize_window_targeter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/views_test_helper_aura.cc
diff --git a/ui/views/test/views_test_helper_aura.cc b/ui/views/test/views_test_helper_aura.cc
index f3705b6d0830e6e8174526248be9538ef962637c..0460cac067790fc5c321bc7357024d2548fe6113 100644
--- a/ui/views/test/views_test_helper_aura.cc
+++ b/ui/views/test/views_test_helper_aura.cc
@@ -9,7 +9,6 @@
#include "ui/wm/core/capture_controller.h"
#include "ui/wm/core/default_activation_client.h"
#include "ui/wm/core/default_screen_position_client.h"
-#include "ui/wm/core/wm_state.h"
namespace views {
@@ -32,7 +31,6 @@ void ViewsTestHelperAura::SetUp() {
aura_test_helper_->SetUp(context_factory_);
gfx::NativeWindow root_window = GetContext();
new wm::DefaultActivationClient(root_window);
- wm_state_.reset(new wm::WMState);
if (!aura::client::GetScreenPositionClient(root_window)) {
screen_position_client_.reset(new wm::DefaultScreenPositionClient);
@@ -56,7 +54,6 @@ void ViewsTestHelperAura::TearDown() {
aura::client::SetScreenPositionClient(GetContext(), nullptr);
aura_test_helper_->TearDown();
- wm_state_.reset();
CHECK(!wm::ScopedCaptureClient::IsActive());
}
« no previous file with comments | « ui/views/test/views_test_helper_aura.h ('k') | ui/wm/core/easy_resize_window_targeter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698