diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 16:26:11 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 16:26:11 +0000 |
| commit | 128daf6bc3b24d366cf8f252ebe20f70818ea1b7 (patch) | |
| tree | 8f6c4f5cf42904532664f7786857400be61251b7 /mojo/shell/android | |
| parent | cd4186fcba54ce17d0c16467fdb8835286aa466f (diff) | |
| download | chromium_src-128daf6bc3b24d366cf8f252ebe20f70818ea1b7.zip chromium_src-128daf6bc3b24d366cf8f252ebe20f70818ea1b7.tar.gz chromium_src-128daf6bc3b24d366cf8f252ebe20f70818ea1b7.tar.bz2 | |
Create Application class
BUG=
R=darin@chromium.org
Review URL: https://codereview.chromium.org/135513008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell/android')
| -rw-r--r-- | mojo/shell/android/mojo_main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc index 127471e..122a525 100644 --- a/mojo/shell/android/mojo_main.cc +++ b/mojo/shell/android/mojo_main.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "jni/MojoMain_jni.h" -#include "mojo/public/shell/service.h" +#include "mojo/public/shell/application.h" #include "mojo/services/native_viewport/native_viewport_service.h" #include "mojo/shell/context.h" #include "mojo/shell/init.h" @@ -43,10 +43,10 @@ class NativeViewportServiceLoader : public shell::ServiceConnector::Loader { virtual void Load(const GURL& url, ScopedShellHandle service_handle) MOJO_OVERRIDE { - service_.reset(CreateNativeViewportService(g_context.Get().get(), - service_handle.Pass())); + app_.reset(CreateNativeViewportService(g_context.Get().get(), + service_handle.Pass())); } - scoped_ptr<ServiceFactoryBase> service_; + scoped_ptr<Application> app_; }; LazyInstance<scoped_ptr<NativeViewportServiceLoader> > |