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

Unified Diff: ash/wm/dock/docked_window_layout_manager_unittest.cc

Issue 1907863002: Converts DockedWindowLayoutManager to common ash/wm types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 4 years, 8 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/dock/docked_window_layout_manager.cc ('k') | ash/wm/dock/docked_window_resizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/dock/docked_window_layout_manager_unittest.cc
diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc
index 57869196d4e70f4d78fdb1ee8496d11c8f142ba7..3f629b359de865d037d47d5988377a6f6aa6b493 100644
--- a/ash/wm/dock/docked_window_layout_manager_unittest.cc
+++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
@@ -270,8 +270,8 @@ TEST_P(DockedWindowLayoutManagerTest, AutoPlacingLeft) {
window->GetBoundsInScreen().x());
EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
- DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(
- window->parent()->layout_manager());
+ DockedWindowLayoutManager* manager =
+ DockedWindowLayoutManager::Get(wm::WmWindowAura::Get(window.get()));
// Create two additional windows and test their auto-placement
std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
@@ -320,8 +320,8 @@ TEST_P(DockedWindowLayoutManagerTest, AutoPlacingRight) {
window->GetBoundsInScreen().right());
EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
- DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(
- window->parent()->layout_manager());
+ DockedWindowLayoutManager* manager =
+ DockedWindowLayoutManager::Get(wm::WmWindowAura::Get(window.get()));
// Create two additional windows and test their auto-placement
std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
@@ -374,8 +374,8 @@ TEST_P(DockedWindowLayoutManagerTest, AutoPlacingRightSecondScreen) {
window->GetBoundsInScreen().right());
EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
- DockedWindowLayoutManager* manager = static_cast<DockedWindowLayoutManager*>(
- window->parent()->layout_manager());
+ DockedWindowLayoutManager* manager =
+ DockedWindowLayoutManager::Get(wm::WmWindowAura::Get(window.get()));
// Create two additional windows and test their auto-placement
bounds = gfx::Rect(616, 32, 231, 320);
« no previous file with comments | « ash/wm/dock/docked_window_layout_manager.cc ('k') | ash/wm/dock/docked_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698