Refactor ContentViewClient (1/6)

content/browser/android/content_video_view.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_ANDROID_CONTENT_VIDEO_VIEW_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIDEO_VIEW_H_
 
 #include <jni.h>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "ui/gl/android/scoped_java_surface.h"
 
+namespace web_contents_delegate_android {

[boliu, 2016/09/26 21:25:24]

this is unused (also layering violation?)

[Jinsuk Kim, 2016/09/27 10:08:58]

Done.

+class WebContentsDelegateAndroid;
+}
+
 namespace content {
 
 // Native mirror of ContentVideoView.java. This class is responsible for
 // creating the Java video view and passing changes in player status to it.
 // This class must be used on the UI thread.
 class ContentVideoView {
  public:
   static bool RegisterContentVideoView(JNIEnv* env);
 
   // Returns the singleton object or NULL.
@@ skipping 12 matching lines @@
     virtual void DidExitFullscreen(bool release_media_player) = 0;
 
    protected:
     ~Client() {}
 
     DISALLOW_COPY_AND_ASSIGN(Client);
   };
 
   explicit ContentVideoView(Client* client,
                             ContentViewCore* content_view_core,
+                            const base::android::JavaRef<jobject>& embedder,
                             const gfx::Size& video_natural_size);
   ~ContentVideoView();
 
   // To open another video on existing ContentVideoView.
   void OpenVideo();
 
   // Display an error dialog to the user.
   void OnMediaPlayerError(int error_type);
 
   // Update the video size.
@@ skipping 24 matching lines @@
                                 bool is_orientation_portrait);
   void RecordExitFullscreenPlayback(
       JNIEnv*,
       const base::android::JavaParamRef<jobject>&,
       bool is_portrait_video,
       long playback_duration_in_milliseconds_before_orientation_change,
       long playback_duration_in_milliseconds_after_orientation_change);
 
  private:
   // Creates the corresponding ContentVideoView Java object.
-  JavaObjectWeakGlobalRef CreateJavaObject(ContentViewCore* content_view_core,
-                                           const gfx::Size& video_natural_size);
+  JavaObjectWeakGlobalRef CreateJavaObject(
+      ContentViewCore* content_view_core,
+      const base::android::JavaRef<jobject>& j_content_video_view_embedder,
+      const gfx::Size& video_natural_size);
 
   Client* client_;
 
   // Weak reference to corresponding Java object.
   JavaObjectWeakGlobalRef j_content_video_view_;
 
   // Weak pointer for posting tasks.
   base::WeakPtrFactory<ContentVideoView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentVideoView);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIDEO_VIEW_H_