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

Unified Diff: chrome/browser/chromeos/login/login_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/chromeos/login/login_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index feef0793623a0c482e196b5351793a3a6767ab31..0ea474b3f57631de19858badb4fba00ebf87aea5 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -329,8 +329,7 @@ class ActiveDirectoryLoginTest : public LoginManagerTest {
void TestSystemTrayIsVisible(bool otr) {
ash::SystemTray* tray = ash::Shell::Get()->GetPrimarySystemTray();
aura::Window* primary_win = ash::Shell::GetPrimaryRootWindow();
- ash::WmWindow* wm_primary_win = ash::WmWindow::Get(primary_win);
- ash::WmShelf* wm_shelf = ash::WmShelf::ForWindow(wm_primary_win);
+ ash::WmShelf* wm_shelf = ash::WmShelf::ForWindow(primary_win);
SCOPED_TRACE(testing::Message()
<< "ShelfVisibilityState=" << wm_shelf->GetVisibilityState()
<< " ShelfAutoHideBehavior=" << wm_shelf->auto_hide_behavior());
« no previous file with comments | « chrome/browser/chromeos/first_run/steps/tray_step.cc ('k') | chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698