diff options
| author | ben <ben@chromium.org> | 2015-09-17 19:46:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 02:47:10 +0000 |
| commit | 29dec844330333ee0aacb9beb5cfb58d7ba31d18 (patch) | |
| tree | 1fcc5b6da23548f3e59524cd9266c02c3d2190d1 /mandoline/app/android | |
| parent | 94d04853543125b5ff421696babb3bf74900a817 (diff) | |
| download | chromium_src-29dec844330333ee0aacb9beb5cfb58d7ba31d18.zip chromium_src-29dec844330333ee0aacb9beb5cfb58d7ba31d18.tar.gz chromium_src-29dec844330333ee0aacb9beb5cfb58d7ba31d18.tar.bz2 | |
Some more minor cleanup to ApplicationManager.
R=yzshen@chromium.org
http://crbug.com/533085
Committed: https://crrev.com/c6bde172a35b65b5a735675e840fab55921d28f8
Cr-Commit-Position: refs/heads/master@{#349515}
Review URL: https://codereview.chromium.org/1351963002
Cr-Commit-Position: refs/heads/master@{#349590}
Diffstat (limited to 'mandoline/app/android')
| -rw-r--r-- | mandoline/app/android/BUILD.gn | 1 | ||||
| -rw-r--r-- | mandoline/app/android/mandoline_activity.cc | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mandoline/app/android/BUILD.gn b/mandoline/app/android/BUILD.gn index 20c3fac..3823c04 100644 --- a/mandoline/app/android/BUILD.gn +++ b/mandoline/app/android/BUILD.gn @@ -27,6 +27,7 @@ executable("mandoline_runner") { "//mojo/package_manager", "//mojo/runner:lib", "//mojo/runner:mojo_runner_lib", + "//mojo/shell", ] sources = [ diff --git a/mandoline/app/android/mandoline_activity.cc b/mandoline/app/android/mandoline_activity.cc index 0d05724..6ad7a8c 100644 --- a/mandoline/app/android/mandoline_activity.cc +++ b/mandoline/app/android/mandoline_activity.cc @@ -7,6 +7,7 @@ #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 { @@ -14,8 +15,9 @@ static void LaunchURL(JNIEnv* env, const JavaParamRef<jclass>& clazz, const JavaParamRef<jstring>& jurl) { LaunchHandlerPtr launch_handler; - mojo::runner::GetContext()->application_manager()->ConnectToService( - GURL("mojo:phone_ui"), &launch_handler); + mojo::shell::ConnectToService( + mojo::runner::GetContext()->application_manager(), GURL("mojo:phone_ui"), + &launch_handler); launch_handler->LaunchURL( base::android::ConvertJavaStringToUTF8(env, jurl)); } |