components/arc/intent_helper/arc_intent_helper_bridge.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: components/arc/intent_helper/arc_intent_helper_bridge.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: Address comments 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: components/arc/intent_helper/arc_intent_helper_bridge.cc

diff --git a/components/arc/intent_helper/arc_intent_helper_bridge.cc b/components/arc/intent_helper/arc_intent_helper_bridge.cc

index 162ea38e14ac7f6c651cba01acf824b7f6eaf401..64176dde1c09fb92f4d975f9b5d73ef6f534b039 100644

--- a/components/arc/intent_helper/arc_intent_helper_bridge.cc

+++ b/components/arc/intent_helper/arc_intent_helper_bridge.cc

@@ -9,8 +9,8 @@

#include "ash/common/new_window_delegate.h"

#include "ash/common/shell_delegate.h"

+#include "ash/common/wallpaper/wallpaper_delegate.h"

#include "ash/common/wm_shell.h"

-#include "ash/desktop_background/user_wallpaper_delegate.h"

#include "ash/shell.h"

#include "base/memory/weak_ptr.h"

#include "components/arc/intent_helper/activity_icon_loader.h"

@@ -82,7 +82,7 @@ void ArcIntentHelperBridge::OnOpenUrl(const mojo::String& url) {

void ArcIntentHelperBridge::OpenWallpaperPicker() {

DCHECK(thread_checker_.CalledOnValidThread());

- ash::Shell::GetInstance()->user_wallpaper_delegate()->OpenSetWallpaperPage();

+ ash::WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage();

}

void ArcIntentHelperBridge::SetWallpaper(mojo::Array<uint8_t> jpeg_data) {

« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | no next file » | no next file with comments »