chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc - Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)

Patch Set: rebase 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

« no previous file with comments | « chrome/browser/chromeos/login/login_browsertest.cc ('k') | chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 887cf32412e0f0914663ada2a962d6e1633b50d5..464859359f02c7b07a344410df19f5f6c80af2bd 100644

--- a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc

+++ b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc

@@ -5,7 +5,7 @@

#include "chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h"

#include "ash/root_window_controller.h"

-#include "ash/shelf/wm_shelf.h"

+#include "ash/shelf/shelf.h"

#include "ash/shell.h"

#include "base/macros.h"

#include "base/strings/utf_string_conversions.h"

@@ -85,7 +85,7 @@ void MultiprofilesSessionAbortedView::ShowDialog(

std::vector<ash::RootWindowController*> controllers =

ash::Shell::GetAllRootWindowControllers();

for (ash::RootWindowController* controller : controllers) {

- controller->wm_shelf()->SetAutoHideBehavior(

+ controller->shelf()->SetAutoHideBehavior(

ash::SHELF_AUTO_HIDE_ALWAYS_HIDDEN);

}