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

Unified Diff: ash/wm/panels/panel_window_resizer_unittest.cc

Issue 2731663002: Remove WmWindowProperty (Closed)
Patch Set: rebase Created 3 years, 10 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/window_mirror_view.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 12164acea632926a0617097b0ba0a242193dd1e7..f81bd5027a4aa0d647056182ebc71093fec9ac58 100644
--- a/ash/wm/panels/panel_window_resizer_unittest.cc
+++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -13,7 +13,6 @@
#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"
#include "ash/public/cpp/window_properties.h"
@@ -22,6 +21,7 @@
#include "ash/test/ash_test_base.h"
#include "ash/test/cursor_manager_test_api.h"
#include "ash/wm/drag_window_resizer.h"
+#include "ash/wm/window_properties.h"
#include "ash/wm/window_state_aura.h"
#include "base/i18n/rtl.h"
#include "ui/aura/client/aura_constants.h"
@@ -132,8 +132,7 @@ class PanelWindowResizerTest : public test::AshTestBase {
for (std::vector<aura::Window *>::const_iterator
iter = window_order.begin();
iter != window_order.end(); ++iter, ++panel_index) {
- ShelfID id =
- WmWindow::Get(*iter)->GetIntProperty(WmWindowProperty::SHELF_ID);
+ ShelfID id = (*iter)->GetProperty(kShelfIDKey);
EXPECT_EQ(id, model_->items()[panel_index].id);
}
}
« no previous file with comments | « ash/wm/panels/panel_layout_manager_unittest.cc ('k') | ash/wm/window_mirror_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698