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

Unified Diff: components/arc/intent_helper/arc_intent_helper_bridge.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 5 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/ui/window_sizer/window_sizer_ash_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8ad915f4d7d2dd5de3ad9ac318ae8af56b66a16b..e4a2660b79d3f75046ca4fe8ce8c2332ba8f890e 100644
--- a/components/arc/intent_helper/arc_intent_helper_bridge.cc
+++ b/components/arc/intent_helper/arc_intent_helper_bridge.cc
@@ -7,10 +7,11 @@
#include <utility>
#include <vector>
+#include "ash/common/shell_delegate.h"
+#include "ash/common/wm_shell.h"
#include "ash/desktop_background/user_wallpaper_delegate.h"
#include "ash/new_window_delegate.h"
#include "ash/shell.h"
-#include "ash/shell_delegate.h"
#include "base/memory/weak_ptr.h"
#include "components/arc/intent_helper/activity_icon_loader.h"
#include "components/arc/intent_helper/link_handler_model_impl.h"
@@ -76,7 +77,7 @@ void ArcIntentHelperBridge::OnOpenDownloads() {
void ArcIntentHelperBridge::OnOpenUrl(const mojo::String& url) {
DCHECK(thread_checker_.CalledOnValidThread());
GURL gurl(url.get());
- ash::Shell::GetInstance()->delegate()->OpenUrl(gurl);
+ ash::WmShell::Get()->delegate()->OpenUrl(gurl);
}
void ArcIntentHelperBridge::OpenWallpaperPicker() {
« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698