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

Unified Diff: ui/wm/core/shadow_controller_unittest.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/wm/core/focus_controller_unittest.cc ('k') | ui/wm/core/transient_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/shadow_controller_unittest.cc
diff --git a/ui/wm/core/shadow_controller_unittest.cc b/ui/wm/core/shadow_controller_unittest.cc
index 3cc1668f2298e27d3a6d3ac24cee623221a11f04..a560985a0279ecab4b149cc402e182c880b4d8ea 100644
--- a/ui/wm/core/shadow_controller_unittest.cc
+++ b/ui/wm/core/shadow_controller_unittest.cc
@@ -19,7 +19,6 @@
#include "ui/wm/core/shadow.h"
#include "ui/wm/core/shadow_types.h"
#include "ui/wm/core/window_util.h"
-#include "ui/wm/core/wm_state.h"
#include "ui/wm/public/activation_client.h"
namespace wm {
@@ -30,7 +29,6 @@ class ShadowControllerTest : public aura::test::AuraTestBase {
~ShadowControllerTest() override {}
void SetUp() override {
- wm_state_.reset(new wm::WMState);
AuraTestBase::SetUp();
new wm::DefaultActivationClient(root_window());
aura::client::ActivationClient* activation_client =
@@ -40,7 +38,6 @@ class ShadowControllerTest : public aura::test::AuraTestBase {
void TearDown() override {
shadow_controller_.reset();
AuraTestBase::TearDown();
- wm_state_.reset();
}
protected:
@@ -55,7 +52,6 @@ class ShadowControllerTest : public aura::test::AuraTestBase {
private:
std::unique_ptr<ShadowController> shadow_controller_;
- std::unique_ptr<wm::WMState> wm_state_;
DISALLOW_COPY_AND_ASSIGN(ShadowControllerTest);
};
« no previous file with comments | « ui/wm/core/focus_controller_unittest.cc ('k') | ui/wm/core/transient_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698