diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 05:10:07 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 05:10:07 +0000 |
commit | c1e5c788c583e685210dcae48b025c95bf71ca56 (patch) | |
tree | 8864248730baca00f49a0431742a4736e63cc9bb /mojo/shell/context.h | |
parent | 64bbd6c50ad2958b1de844d419b5a0f4e8db4b0f (diff) | |
download | chromium_src-c1e5c788c583e685210dcae48b025c95bf71ca56.zip chromium_src-c1e5c788c583e685210dcae48b025c95bf71ca56.tar.gz chromium_src-c1e5c788c583e685210dcae48b025c95bf71ca56.tar.bz2 |
Mojo: Add BindingsSupportImpl on top of HandleWatcher (take 2)
Plumb MojoResult to the callback set on HandleWatcher. Revise BindingsSupport
interface to make the implementation on top of HandleWatcher trivial.
Originally reviewed at https://codereview.chromium.org/62773003/. Includes fix
to mojo.gyp to make libmojo_shell link against mojo_common_lib on Android.
R=sky@chromium.org
Review URL: https://codereview.chromium.org/69633002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell/context.h')
-rw-r--r-- | mojo/shell/context.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mojo/shell/context.h b/mojo/shell/context.h index f2dec12..16c04b4 100644 --- a/mojo/shell/context.h +++ b/mojo/shell/context.h @@ -5,6 +5,7 @@ #ifndef MOJO_SHELL_CONTEXT_H_ #define MOJO_SHELL_CONTEXT_H_ +#include "mojo/common/bindings_support_impl.h" #include "mojo/shell/loader.h" #include "mojo/shell/storage.h" #include "mojo/shell/task_runners.h" @@ -34,6 +35,7 @@ class Context { TaskRunners task_runners_; Storage storage_; Loader loader_; + common::BindingsSupportImpl bindings_support_impl_; #if defined(OS_ANDROID) base::android::ScopedJavaGlobalRef<jobject> activity_; |