<webview>: Move NewWindow API to chrome

chrome/browser/guest_view/web_view/web_view_guest.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 CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
 #define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
 
 #include <vector>
 
 #include "base/observer_list.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/guest_view/guest_view.h"
 #include "chrome/browser/guest_view/web_view/javascript_dialog_helper.h"
 #include "chrome/browser/guest_view/web_view/web_view_find_helper.h"
+#include "chrome/browser/guest_view/web_view/web_view_permission_types.h"
 #include "chrome/common/extensions/api/webview.h"
 #include "content/public/browser/javascript_dialog_manager.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/WebKit/public/web/WebFindOptions.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #endif
 
@@ skipping 15 matching lines @@
 // API and manages the lifetime of <webview> extension events. WebViewGuest is
 // created on attachment. That is, when a guest WebContents is associated with
 // a particular embedder WebContents. This happens on either initial navigation
 // or through the use of the New Window API, when a new window is attached to
 // a particular <webview>.
 class WebViewGuest : public GuestView<WebViewGuest>,
                      public content::NotificationObserver,
                      public content::WebContentsObserver {
  public:
   WebViewGuest(content::WebContents* guest_web_contents,
-               const std::string& embedder_extension_id,
-               const base::WeakPtr<GuestViewBase>& opener);
+               const std::string& embedder_extension_id);
 
   // Returns guestview::kInstanceIDNone if |contents| does not correspond to a
   // WebViewGuest.
   static int GetViewInstanceId(content::WebContents* contents);
   static const char Type[];
 
   typedef std::vector<linked_ptr<webview_api::ContextMenuItem> > MenuItemVector;
   // Shows the context menu for the guest.
   // |items| acts as a filter. This restricts the current context's default
   // menu items to contain only the items from |items|.
@@ skipping 20 matching lines @@
   virtual void FindReply(int request_id,
                          int number_of_matches,
                          const gfx::Rect& selection_rect,
                          int active_match_ordinal,
                          bool final_update) OVERRIDE;
   virtual void GuestProcessGone(base::TerminationStatus status) OVERRIDE;
   virtual bool HandleKeyboardEvent(
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
   virtual bool IsDragAndDropEnabled() OVERRIDE;
   virtual bool IsOverridingUserAgent() const OVERRIDE;
-  virtual void LoadAbort(bool is_top_level,
-                         const GURL& url,
-                         const std::string& error_type) OVERRIDE;
   virtual void RendererResponsive() OVERRIDE;
   virtual void RendererUnresponsive() OVERRIDE;
-  virtual void RequestPermission(
-      BrowserPluginPermissionType permission_type,
-      const base::DictionaryValue& request_info,
-      const PermissionResponseCallback& callback,
-      bool allowed_by_default) OVERRIDE;
-  virtual GURL ResolveURL(const std::string& src) OVERRIDE;
   virtual void SizeChanged(const gfx::Size& old_size, const gfx::Size& new_size)
       OVERRIDE;
   virtual void RequestMediaAccessPermission(
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback) OVERRIDE;
   virtual void CanDownload(const std::string& request_method,
                            const GURL& url,
                            const base::Callback<void(bool)>& callback) OVERRIDE;
   virtual void RequestPointerLockPermission(
       bool user_gesture,
       bool last_unlocked_by_target,
       const base::Callback<void(bool)>& callback) OVERRIDE;
   virtual content::JavaScriptDialogManager*
       GetJavaScriptDialogManager() OVERRIDE;
+  virtual void NavigateGuest(const std::string& src) OVERRIDE;
+  virtual void Destroy() OVERRIDE;
+  virtual void AddNewContents(content::WebContents* source,
+                              content::WebContents* new_contents,
+                              WindowOpenDisposition disposition,
+                              const gfx::Rect& initial_pos,
+                              bool user_gesture,
+                              bool* was_blocked) OVERRIDE;
+  virtual content::WebContents* OpenURLFromTab(
+      content::WebContents* source,
+      const content::OpenURLParams& params) OVERRIDE;
+  virtual void WebContentsCreated(content::WebContents* source_contents,
+                                  int opener_render_frame_id,
+                                  const base::string16& frame_name,
+                                  const GURL& target_url,
+                                  content::WebContents* new_contents) OVERRIDE;
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Set the zoom factor.
   virtual void SetZoom(double zoom_factor) OVERRIDE;
 
   // Returns the current zoom factor.
   double GetZoom();
 
   // Begin or continue a find request.
   void Find(const base::string16& search_text,
             const blink::WebFindOptions& options,
             scoped_refptr<extensions::WebviewFindFunction> find_function);
 
   // Conclude a find request to clear highlighting.
   void StopFinding(content::StopFindAction);
 
   // If possible, navigate the guest to |relative_index| entries away from the
   // current navigation entry.
   void Go(int relative_index);
 
   // Reload the guest.
   void Reload();
 
+  typedef base::Callback<void(bool /* allow */,
+                              const std::string& /* user_input */)>
+      PermissionResponseCallback;
+  int RequestPermission(
+      WebViewPermissionType permission_type,
+      const base::DictionaryValue& request_info,
+      const PermissionResponseCallback& callback,
+      bool allowed_by_default);
+
   // Requests Geolocation Permission from the embedder.
   void RequestGeolocationPermission(int bridge_id,
                                     const GURL& requesting_frame,
                                     bool user_gesture,
                                     const base::Callback<void(bool)>& callback);
 
   void OnWebViewGeolocationPermissionResponse(
       int bridge_id,
       bool user_gesture,
       const base::Callback<void(bool)>& callback,
@@ skipping 11 matching lines @@
   void OnWebViewDownloadPermissionResponse(
       const base::Callback<void(bool)>& callback,
       bool allow,
       const std::string& user_input);
 
   void OnWebViewPointerLockPermissionResponse(
       const base::Callback<void(bool)>& callback,
       bool allow,
       const std::string& user_input);
 
+  void OnWebViewNewWindowResponse(
+     int new_window_instance_id,

[lazyboy, 2014/05/12 23:00:20]

Can fit in previous line, indentation is off.

[Fady Samuel, 2014/05/13 18:59:02]

Done.

+     bool allow,
+     const std::string& user_input);
+
   enum PermissionResponseAction {
     DENY,
     ALLOW,
     DEFAULT
   };
 
   enum SetPermissionResult {
     SET_PERMISSION_INVALID,
     SET_PERMISSION_ALLOWED,
     SET_PERMISSION_DENIED
@@ skipping 27 matching lines @@
   extensions::ScriptExecutor* script_executor() {
     return script_executor_.get();
   }
 
  private:
   virtual ~WebViewGuest();
 
   // A map to store the callback for a request keyed by the request's id.
   struct PermissionResponseInfo {
     PermissionResponseCallback callback;
-    BrowserPluginPermissionType permission_type;
+    WebViewPermissionType permission_type;
     bool allowed_by_default;
     PermissionResponseInfo();
     PermissionResponseInfo(const PermissionResponseCallback& callback,
-                           BrowserPluginPermissionType permission_type,
+                           WebViewPermissionType permission_type,
                            bool allowed_by_default);
     ~PermissionResponseInfo();
   };
 
   static void RecordUserInitiatedUMA(const PermissionResponseInfo& info,
                                      bool allow);
 
   // Returns the top level items (ignoring submenus) as Value.
   static scoped_ptr<base::ListValue> MenuModelToValue(
       const ui::SimpleMenuModel& menu_model);
@@ skipping 48 matching lines @@
     const chromeos::AccessibilityStatusEventDetails& details);
 #endif
 
   void InjectChromeVoxIfNeeded(content::RenderViewHost* render_view_host);
 
   // Bridge IDs correspond to a geolocation request. This method will remove
   // the bookkeeping for a particular geolocation request associated with the
   // provided |bridge_id|. It returns the request ID of the geolocation request.
   int RemoveBridgeID(int bridge_id);
 
-  int RequestPermissionInternal(
-      BrowserPluginPermissionType permission_type,
-      const base::DictionaryValue& request_info,
-      const PermissionResponseCallback& callback,
-      bool allowed_by_default);
+  void LoadURLWithParams(const GURL& url,
+                         const content::Referrer& referrer,
+                         content::PageTransition transition_type,
+                         content::WebContents* web_contents);
+
+  void RequestNewWindowPermission(
+      WindowOpenDisposition disposition,
+      const gfx::Rect& initial_bounds,
+      bool user_gesture,
+      content::WebContents* new_contents);
+
+  // Destroy unattached new windows that have been opened by this
+  // WebViewGuest.
+  void DestroyUnattachedWindows();
+
+  // Requests resolution of a potentially relative URL.
+  GURL ResolveURL(const std::string& src);
+
+  // Notification that a load in the guest resulted in abort. Note that |url|
+  // may be invalid.
+  void LoadAbort(bool is_top_level,
+                 const GURL& url,
+                 const std::string& error_type);
+
+
+  // Creates a new guest window owned by this WebViewGuest
+  // BrowserPluginGuest.
+  WebViewGuest* CreateNewGuestWindow(const content::OpenURLParams& params);
 
   ObserverList<extensions::TabHelper::ScriptExecutionObserver>
       script_observers_;
   scoped_ptr<extensions::ScriptExecutor> script_executor_;
 
   content::NotificationRegistrar notification_registrar_;
 
   // A counter to generate a unique request id for a context menu request.
   // We only need the ids to be unique for a given WebViewGuest.
   int pending_context_menu_request_id_;
@@ skipping 35 matching lines @@
   scoped_ptr<RenderViewContextMenu> pending_menu_;
 
 #if defined(OS_CHROMEOS)
   // Subscription to receive notifications on changes to a11y settings.
   scoped_ptr<chromeos::AccessibilityStatusSubscription>
       accessibility_subscription_;
 #endif
 
   std::map<int, int> bridge_id_to_request_id_map_;
 
+  // Tracks the name, and target URL of the new window and whether or not it has
+  // changed since the WebContents has been created and before the new window
+  // has been attached to a BrowserPlugin. Once the first navigation commits, we
+  // no longer track this information.
+  struct NewWindowInfo {
+    GURL url;
+    std::string name;
+    NewWindowInfo(const GURL& url, const std::string& name) :
+        url(url),
+        name(name) {}
+  };
+
+  typedef std::map<WebViewGuest*, NewWindowInfo> PendingWindowMap;
+  PendingWindowMap pending_new_windows_;
+
   DISALLOW_COPY_AND_ASSIGN(WebViewGuest);
 };
 
 #endif  // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_