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

Unified Diff: ash/wm/panels/panel_window_resizer_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
« no previous file with comments | « ash/wm/panels/panel_layout_manager_unittest.cc ('k') | ash/wm/screen_dimmer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panels/panel_window_resizer_unittest.cc
diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc
index 0ce01b79d6cd4d107b8b5e951ff034eff594a08c..10d2ab1c312471a309dc286fc57f32a1c161b6cd 100644
--- a/ash/wm/panels/panel_window_resizer_unittest.cc
+++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -4,7 +4,6 @@
#include "ash/common/wm/panels/panel_window_resizer.h"
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/shelf/shelf_layout_manager.h"
#include "ash/common/shelf/shelf_model.h"
#include "ash/common/shelf/shelf_widget.h"
@@ -13,6 +12,7 @@
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
#include "ash/common/wm_window_property.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/cpp/shell_window_ids.h"
@@ -64,13 +64,12 @@ class PanelWindowResizerTest : public test::AshTestBase {
gfx::Rect bounds(origin, gfx::Size(101, 101));
aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
NULL, ui::wm::WINDOW_TYPE_PANEL, 0, bounds);
- test::TestShelfDelegate::instance()->AddShelfItem(
- WmWindowAura::Get(window));
+ test::TestShelfDelegate::instance()->AddShelfItem(WmWindow::Get(window));
return window;
}
void DragStart(aura::Window* window) {
- resizer_.reset(CreateWindowResizer(WmWindowAura::Get(window),
+ resizer_.reset(CreateWindowResizer(WmWindow::Get(window),
window->bounds().origin(), HTCAPTION,
aura::client::WINDOW_MOVE_SOURCE_MOUSE)
.release());
@@ -138,7 +137,7 @@ class PanelWindowResizerTest : public test::AshTestBase {
iter = window_order.begin();
iter != window_order.end(); ++iter, ++panel_index) {
ShelfID id =
- WmWindowAura::Get(*iter)->GetIntProperty(WmWindowProperty::SHELF_ID);
+ WmWindow::Get(*iter)->GetIntProperty(WmWindowProperty::SHELF_ID);
EXPECT_EQ(id, model_->items()[panel_index].id);
}
}
« no previous file with comments | « ash/wm/panels/panel_layout_manager_unittest.cc ('k') | ash/wm/screen_dimmer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698