chrome/browser/ui/ash/chrome_shell_delegate.cc - Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash.

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/ui/ash/chrome_shell_delegate.cc

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleanup. 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

« chrome/browser/chromeos/background/ash_wallpaper_delegate.h ('K') | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/chrome_shell_delegate.cc

diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc

index 0a6bf5a4d3bf6146562573c0a227ed8945b6f8a7..4f0595bb44377a49374df295807e51863c49e567 100644

--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc

+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc

@@ -28,7 +28,7 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

#include "chrome/browser/chromeos/accessibility/magnification_manager.h"

-#include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"

+#include "chrome/browser/chromeos/background/ash_wallpaper_delegate.h"

#include "chrome/browser/chromeos/display/display_configuration_observer.h"

#include "chrome/browser/chromeos/display/display_preferences.h"

#include "chrome/browser/chromeos/policy/display_rotation_default_handler.h"

@@ -511,8 +511,8 @@ ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {

return chromeos::CreateSystemTrayDelegate();

}

-ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() {

- return chromeos::CreateUserWallpaperDelegate();

+ash::WallpaperDelegate* ChromeShellDelegate::CreateWallpaperDelegate() {

+ return chromeos::CreateWallpaperDelegate();

}

void ChromeShellDelegate::Observe(int type,