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

Unified Diff: chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc

Issue 2626483002: Removes WmShelfAura and WmShelfMus (Closed)
Patch Set: merge Created 3 years, 11 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/shelf/shelf_layout_manager_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc
diff --git a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc
index 6cdcce648d31b7299b57d62ff80b8dd24c2e737d..c9a5ddf65740a7392392f0c6df9abeb72ed31e79 100644
--- a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc
+++ b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h"
-#include "ash/aura/wm_shelf_aura.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "base/macros.h"
@@ -83,7 +83,7 @@ void MultiprofilesSessionAbortedView::ShowDialog(
std::vector<ash::RootWindowController*> controllers =
ash::Shell::GetAllRootWindowControllers();
for (ash::RootWindowController* controller : controllers) {
- controller->wm_shelf_aura()->SetAutoHideBehavior(
+ controller->wm_shelf()->SetAutoHideBehavior(
ash::SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
}
}
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698