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

mojo/services/native_viewport/native_viewport_android.cc

 // 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.
 
 #include "mojo/services/native_viewport/native_viewport_android.h"
 
 #include <android/input.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
 #include "jni/NativeViewportAndroid_jni.h"
-#include "mojo/shell/context.h"
+#include "mojo/services/native_viewport/native_viewport_context.h"
 #include "ui/events/event.h"
 #include "ui/gfx/point.h"
 
 namespace mojo {
 namespace services {
 
 ui::EventType MotionEventActionToEventType(jint action) {
   switch (action) {
     case AMOTION_EVENT_ACTION_DOWN:
       return ui::ET_TOUCH_PRESSED;
     case AMOTION_EVENT_ACTION_MOVE:
       return ui::ET_TOUCH_MOVED;
     case AMOTION_EVENT_ACTION_UP:
       return ui::ET_TOUCH_RELEASED;
     default:
       NOTREACHED();
   }
   return ui::ET_UNKNOWN;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewportAndroid, public:
 
 // static
 bool NativeViewportAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-NativeViewportAndroid::NativeViewportAndroid(shell::Context* context,
+NativeViewportAndroid::NativeViewportAndroid(NativeViewportContext* context,
                                              NativeViewportDelegate* delegate)
     : delegate_(delegate),
       context_(context),
       window_(NULL),
       id_generator_(0),
       weak_factory_(this) {
 }
 
 NativeViewportAndroid::~NativeViewportAndroid() {
   if (window_)
@@ skipping 44 matching lines @@
     id_generator_.ReleaseNumber(pointer_id);
 
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewportAndroid, NativeViewport implementation:
 
 void NativeViewportAndroid::Init(const gfx::Rect& bounds) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_NativeViewportAndroid_createForActivity(env, context_->activity(),
+  Java_NativeViewportAndroid_createForActivity(env, context_->GetActivity(),

[qsr, 2014/07/21 08:20:25]

Any reason not to use base::android::GetApplicationContext() from
base/android/jni_android.h

 That remove the context alltogether.

                                                reinterpret_cast<jlong>(this));
 }
 
 void NativeViewportAndroid::Show() {
   // Nothing to do. View is created visible.
 }
 
 void NativeViewportAndroid::Hide() {
   // Nothing to do. View is always visible.
 }
@@ skipping 27 matching lines @@
 void NativeViewportAndroid::ReleaseWindow() {
   ANativeWindow_release(window_);
   window_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewport, public:
 
 // static
 scoped_ptr<NativeViewport> NativeViewport::Create(
-    shell::Context* context,
+    NativeViewportContext* context,
     NativeViewportDelegate* delegate) {
   return scoped_ptr<NativeViewport>(
       new NativeViewportAndroid(context, delegate)).Pass();
 }
 
 }  // namespace services
 }  // namespace mojo