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

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

Issue 2237903003: mash: Migrate Shelf aura::Window uses to WmWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move shelf notify functions to WmShell. Created 4 years, 4 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 7a3112ed7f0676091684ebb7432ee85a35cd7857..eb2188af1c890b106874eacfb31e8ea5473e505c 100644
--- a/chrome/browser/ui/ash/shelf_browsertest.cc
+++ b/chrome/browser/ui/ash/shelf_browsertest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/aura/wm_window_aura.h"
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "base/strings/utf_string_conversions.h"
@@ -15,7 +16,8 @@ typedef InProcessBrowserTest ShelfBrowserTest;
// 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::Shelf::ForWindow(browser()->window()->GetNativeWindow())
+ ash::Shelf::ForWindow(
+ ash::WmWindowAura::Get(browser()->window()->GetNativeWindow()))
->shelf_layout_manager();
EXPECT_TRUE(shelf_layout_manager->IsVisible());

Powered by Google App Engine
This is Rietveld 408576698