Upstreaming SelectFileDialog for Android

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index adc40f3bb9586fda077c6ce938c49e0428e27845..6c6119d7b2f96655600b9e1dd3d2b3a40b36b028 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -24,6 +24,10 @@
 
 struct WebMenuItem;
 
+namespace ui {
+class WindowAndroid;
+}
+
 namespace content {
 class ContentViewClient;
 class RenderWidgetHostViewAndroid;
@@ -36,7 +40,8 @@ class ContentViewCoreImpl : public ContentViewCore,
                       jobject obj,
                       bool hardware_accelerated,
                       bool take_ownership_of_web_contents,
-                      WebContents* web_contents);
+                      WebContents* web_contents,
+                      ui::WindowAndroid* window_android);
 
   // ContentViewCore overrides
   virtual void Destroy(JNIEnv* env, jobject obj) OVERRIDE;
@@ -172,6 +177,7 @@ class ContentViewCoreImpl : public ContentViewCore,
   WebContents* web_contents() const { return web_contents_; }
 
   virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;
+  virtual ui::WindowAndroid* GetWindowAndroid() OVERRIDE;
 
  private:
   // NotificationObserver implementation.
@@ -216,6 +222,9 @@ class ContentViewCoreImpl : public ContentViewCore,
   // Whether the renderer backing this ContentViewCore has crashed.
   bool tab_crashed_;
 
+  // The owning window that has a hold of main application activity.
+  ui::WindowAndroid* window_android_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };