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

mojo/shell/context.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_SHELL_CONTEXT_H_
 #define MOJO_SHELL_CONTEXT_H_
 
 #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"
 
 #if defined(OS_ANDROID)
 #include "base/android/scoped_java_ref.h"
 #endif  // defined(OS_ANDROID)
 
 namespace mojo {
 
 class Spy;
 
 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_; }
   KeepAliveCounter* keep_alive_counter() { return &keep_alive_counter_; }
   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; }
 #endif  // defined(OS_ANDROID)
 
  private:
   class NativeViewportServiceLoader;
 
   TaskRunners task_runners_;
   ServiceManager service_manager_;
   MojoURLResolver mojo_url_resolver_;
   scoped_ptr<Spy> spy_;
 #if defined(OS_ANDROID)
   base::android::ScopedJavaGlobalRef<jobject> activity_;
   base::MessageLoop* ui_loop_;
 #endif  // defined(OS_ANDROID)
 
   KeepAliveCounter keep_alive_counter_;
 
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_CONTEXT_H_