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

Unified Diff: ash/mus/test/wm_test_base.h

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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 | « ash/mus/test/ash_test_impl_mus.cc ('k') | ash/mus/test/wm_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/test/wm_test_base.h
diff --git a/ash/mus/test/wm_test_base.h b/ash/mus/test/wm_test_base.h
index ccdc56ca381ce03222ea9c753dcfdcb8e819a4e6..d141dc0f3f61c43f29ea8f8a48fa7e6ff59d50ff 100644
--- a/ash/mus/test/wm_test_base.h
+++ b/ash/mus/test/wm_test_base.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "ash/test/wm_window_aura_test_api.h"
+#include "ash/test/wm_window_test_api.h"
#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/display/display.h"
@@ -89,8 +89,7 @@ class WmTestBase : public testing::Test {
bool setup_called_ = false;
bool teardown_called_ = false;
std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
- std::unique_ptr<WmWindowAuraTestApi::GlobalMinimumSizeLock>
- minimum_size_lock_;
+ std::unique_ptr<WmWindowTestApi::GlobalMinimumSizeLock> minimum_size_lock_;
std::unique_ptr<WmTestHelper> test_helper_;
DISALLOW_COPY_AND_ASSIGN(WmTestBase);
« no previous file with comments | « ash/mus/test/ash_test_impl_mus.cc ('k') | ash/mus/test/wm_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698