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

Unified Diff: ash/wm/workspace_controller_unittest.cc

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
Index: ash/wm/workspace_controller_unittest.cc
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc
index efa8a1edbd875ac79c3c29410ced3742f94f057d..c45f8bb2d683ebc53b150bf429714a9b0ce04925 100644
--- a/ash/wm/workspace_controller_unittest.cc
+++ b/ash/wm/workspace_controller_unittest.cc
@@ -6,7 +6,6 @@
#include <map>
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/shelf/shelf_layout_manager.h"
#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/shelf/wm_shelf.h"
@@ -15,6 +14,7 @@
#include "ash/common/wm/panels/panel_layout_manager.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/workspace/workspace_window_resizer.h"
+#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/screen_util.h"
#include "ash/shell.h"
@@ -121,7 +121,7 @@ class WorkspaceControllerTest : public test::AshMDTestBase {
const gfx::Rect& bounds) {
aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
delegate, ui::wm::WINDOW_TYPE_PANEL, 0, bounds);
- WmWindow* wm_window = WmWindowAura::Get(window);
+ WmWindow* wm_window = WmWindow::Get(window);
test::TestShelfDelegate::instance()->AddShelfItem(wm_window);
PanelLayoutManager::Get(wm_window)->Relayout();
return window;
@@ -1059,8 +1059,8 @@ TEST_P(WorkspaceControllerTest, TestRestoreToUserModifiedBounds) {
// A user moved the window.
std::unique_ptr<WindowResizer> resizer(
- CreateWindowResizer(WmWindowAura::Get(window1.get()), gfx::Point(),
- HTCAPTION, aura::client::WINDOW_MOVE_SOURCE_MOUSE)
+ CreateWindowResizer(WmWindow::Get(window1.get()), gfx::Point(), HTCAPTION,
+ aura::client::WINDOW_MOVE_SOURCE_MOUSE)
.release());
gfx::Point location = resizer->GetInitialLocation();
location.Offset(-50, 0);
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer_unittest.cc ('k') | chrome/browser/chromeos/accessibility/accessibility_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698