Break dependency of native_viewport_service on mojo::shell::Context

mojo/shell/context.h

Index: mojo/shell/context.h
diff --git a/mojo/shell/context.h b/mojo/shell/context.h
index 2173377bec78e9ec574c3bbeb05653ec02724297..a5d89b86384d99f41d9229bedefc08fe578b6cd1 100644
--- a/mojo/shell/context.h
+++ b/mojo/shell/context.h
@@ -7,7 +7,9 @@
 
 #include <string>
 
+#include "build/build_config.h"
 #include "mojo/service_manager/service_manager.h"
+#include "mojo/services/native_viewport/native_viewport_context.h"
 #include "mojo/shell/keep_alive.h"
 #include "mojo/shell/mojo_url_resolver.h"
 #include "mojo/shell/task_runners.h"
@@ -25,10 +27,10 @@ namespace shell {
 class DynamicServiceLoader;
 
 // The "global" context for the shell's main process.
-class Context {
+class Context : public services::NativeViewportContext {

[darin (slow to review), 2014/07/19 04:26:29]

Maybe instead of subclassing NativeViewportContext, Context should have an
instance of a NativeViewportContextImpl as a member variable? That would enable
you to hide more of this Android cruft. Or maybe that'd create other
awkwardnesses...

  public:
   Context();
-  ~Context();
+  virtual ~Context();
 
   TaskRunners* task_runners() { return &task_runners_; }
   ServiceManager* service_manager() { return &service_manager_; }
@@ -36,7 +38,9 @@ class Context {
   MojoURLResolver* mojo_url_resolver() { return &mojo_url_resolver_; }
 
 #if defined(OS_ANDROID)
-  jobject activity() const { return activity_.obj(); }
+  // services::NativeViewportContext override.
+  virtual jobject GetActivity() OVERRIDE;
+
   void set_activity(jobject activity) { activity_.Reset(NULL, activity); }
   base::MessageLoop* ui_loop() const { return ui_loop_; }
   void set_ui_loop(base::MessageLoop* ui_loop) { ui_loop_ = ui_loop; }