Chromecast: makes CastWindowAndroid use CastContentWindow.

chromecast/browser/android/cast_window_android.h

 // Copyright 2014 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 CHROMECAST_BROWSER_ANDROID_CAST_WINDOW_ANDROID_H_
 #define CHROMECAST_BROWSER_ANDROID_CAST_WINDOW_ANDROID_H_
 
 #include <jni.h>
 #include <vector>
 
@@ skipping 15 matching lines @@
 
 class GURL;
 
 namespace content {
 class BrowserContext;
 class SiteInstance;
 class WebContents;
 }  // namespace content
 
 namespace chromecast {
+class CastContentWindow;
 namespace shell {
 
 class CastWindowAndroid : public content::WebContentsDelegate,
                           public content::WebContentsObserver {
  public:
   // Creates a new window and immediately loads the given URL.
   static CastWindowAndroid* CreateNewWindow(
       content::BrowserContext* browser_context,
       const GURL& url);
 
@@ skipping 23 matching lines @@
                                    const base::string16& message,
                                    int32 line_no,
                                    const base::string16& source_id) override;
   virtual void ActivateContents(content::WebContents* contents) override;
   virtual void DeactivateContents(content::WebContents* contents) override;
 
   // content::WebContentsObserver implementation:
   virtual void RenderProcessGone(base::TerminationStatus status) override;
 
  private:
-  explicit CastWindowAndroid(content::WebContents* web_contents);
+  explicit CastWindowAndroid(content::BrowserContext* browser_context);
+  void Initialize();
 
-  // Helper to create a new CastWindowAndroid given a newly created WebContents.
-  static CastWindowAndroid* CreateCastWindowAndroid(
-      content::WebContents* web_contents,
-      const gfx::Size& initial_size);
-
-  base::android::ScopedJavaGlobalRef<jobject> java_object_;
+  content::BrowserContext* browser_context_;
+  base::android::ScopedJavaGlobalRef<jobject> window_java_;
   scoped_ptr<content::WebContents> web_contents_;
+  scoped_ptr<CastContentWindow> content_window_;
 
   base::WeakPtrFactory<CastWindowAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CastWindowAndroid);
 };
 
 }  // namespace shell
 }  // namespace chromecast
 
 #endif  // CHROMECAST_BROWSER_ANDROID_CAST_WINDOW_ANDROID_H_