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

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

Issue 2731663002: Remove WmWindowProperty (Closed)
Patch Set: 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
Index: ash/wm/panels/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index 5c8c44543fdf77aa073b6652de05fd4888f8e0c5..d46267d0789865143e6e516b81af05aecdca554d 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -16,13 +16,13 @@
#include "ash/common/wm/window_state.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/root_window_controller.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shelf_view_test_api.h"
+#include "ash/wm/window_properties.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
@@ -220,7 +220,7 @@ class PanelLayoutManagerTest : public test::AshTestBase {
test_api.SetAnimationDuration(1);
test_api.RunMessageLoopUntilAnimationsDone();
int index = WmShell::Get()->shelf_model()->ItemIndexByID(
- WmWindow::Get(window)->GetIntProperty(WmWindowProperty::SHELF_ID));
+ window->GetProperty(kShelfIDKey));
gfx::Rect bounds = test_api.GetButton(index)->GetBoundsInScreen();
ui::test::EventGenerator& event_generator = GetEventGenerator();

Powered by Google App Engine
This is Rietveld 408576698