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

Unified Diff: chrome/browser/ui/ash/shelf_browsertest.cc

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)
Patch Set: Fix WmShelf::ForWindow. Created 3 years, 7 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: chrome/browser/ui/ash/shelf_browsertest.cc
diff --git a/chrome/browser/ui/ash/shelf_browsertest.cc b/chrome/browser/ui/ash/shelf_browsertest.cc
index 555f3d61d5fd9e942e7b18412715b8f572bfde47..217251732930517f3b725cdb26b1fc1dec9d8d6b 100644
--- a/chrome/browser/ui/ash/shelf_browsertest.cc
+++ b/chrome/browser/ui/ash/shelf_browsertest.cc
@@ -20,8 +20,7 @@ using ShelfBrowserTest = InProcessBrowserTest;
// Confirm that a status bubble doesn't cause the shelf to darken.
IN_PROC_BROWSER_TEST_F(ShelfBrowserTest, StatusBubble) {
ash::ShelfLayoutManager* shelf_layout_manager =
- ash::WmShelf::ForWindow(
- ash::WmWindow::Get(browser()->window()->GetNativeWindow()))
+ ash::WmShelf::ForWindow(browser()->window()->GetNativeWindow())
->shelf_layout_manager();
EXPECT_TRUE(shelf_layout_manager->IsVisible());
@@ -60,7 +59,7 @@ class ShelfGuestSessionBrowserTest : public InProcessBrowserTest {
// Tests that in guest session, shelf alignment could be initialized to bottom
// aligned, instead of bottom locked (crbug.com/699661).
IN_PROC_BROWSER_TEST_F(ShelfGuestSessionBrowserTest, ShelfAlignment) {
- ash::WmShelf* shelf = ash::WmShelf::ForWindow(
- ash::WmWindow::Get(browser()->window()->GetNativeWindow()));
+ ash::WmShelf* shelf =
+ ash::WmShelf::ForWindow(browser()->window()->GetNativeWindow());
EXPECT_EQ(ash::SHELF_ALIGNMENT_BOTTOM, shelf->alignment());
}

Powered by Google App Engine
This is Rietveld 408576698