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

Unified Diff: mandoline/app/android/mandoline_activity.cc

Issue 1354043002: Revert of Some more minor cleanup to ApplicationManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « no previous file | mojo/fetcher/about_fetcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/app/android/mandoline_activity.cc
diff --git a/mandoline/app/android/mandoline_activity.cc b/mandoline/app/android/mandoline_activity.cc
index 6ad7a8cbcb8df32b2cfa2d06fe0522bcd1443976..0d05724fcf4b00c2cf22a0ca7bc8cea70cd516ee 100644
--- a/mandoline/app/android/mandoline_activity.cc
+++ b/mandoline/app/android/mandoline_activity.cc
@@ -7,7 +7,6 @@
#include "mandoline/ui/desktop_ui/public/interfaces/launch_handler.mojom.h"
#include "mojo/runner/android/main.h"
#include "mojo/runner/context.h"
-#include "mojo/shell/connect_util.h"
namespace mandoline {
@@ -15,9 +14,8 @@
const JavaParamRef<jclass>& clazz,
const JavaParamRef<jstring>& jurl) {
LaunchHandlerPtr launch_handler;
- mojo::shell::ConnectToService(
- mojo::runner::GetContext()->application_manager(), GURL("mojo:phone_ui"),
- &launch_handler);
+ mojo::runner::GetContext()->application_manager()->ConnectToService(
+ GURL("mojo:phone_ui"), &launch_handler);
launch_handler->LaunchURL(
base::android::ConvertJavaStringToUTF8(env, jurl));
}
« no previous file with comments | « no previous file | mojo/fetcher/about_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698