<webview>: Move name attribute 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"
@@ skipping 45 matching lines @@
   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|.
   // |items| == NULL means no filtering will be applied.
   void ShowContextMenu(int request_id, const MenuItemVector* items);
 
+  // Sets the frame name of the guest.
+  void SetName(const std::string& name);
+
   // GuestViewBase implementation.
   virtual void Attach(content::WebContents* embedder_web_contents,
                       const base::DictionaryValue& args) OVERRIDE;
 
   // BrowserPluginGuestDelegate public implementation.
   virtual bool HandleContextMenu(
       const content::ContextMenuParams& params) OVERRIDE;
 
   // GuestDelegate implementation.
   virtual void AddMessageToConsole(int32 level,
@@ skipping 45 matching lines @@
                               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;
+  virtual void FrameNameChanged(int render_frame_id,
+                                bool is_top_level,
+                                const std::string& name) 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.
@@ skipping 47 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,
-                                  bool allow,
-                                  const std::string& user_input);
+  void OnWebViewNewWindowResponse(

[lazyboy, 2014/05/21 16:27:05]

nit: Revert this change.

[Fady Samuel, 2014/05/21 16:56:49]

Done.

+     int new_window_instance_id,
+     bool allow,
+     const std::string& user_input);
 
   enum PermissionResponseAction {
     DENY,
     ALLOW,
     DEFAULT
   };
 
   enum SetPermissionResult {
     SET_PERMISSION_INVALID,
     SET_PERMISSION_ALLOWED,
@@ skipping 75 matching lines @@
       bool is_error_page,
       bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DocumentLoadedInFrame(
       int64 frame_id,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidStopLoading(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void WebContentsDestroyed() OVERRIDE;
   virtual void UserAgentOverrideSet(const std::string& user_agent) OVERRIDE;
+  virtual void RenderViewReady() OVERRIDE;
+
+  // Informs the embedder of a frame name change.
+  void ReportFrameNameChange(const std::string& name);
 
   // Called after the load handler is called in the guest's main frame.
   void LoadHandlerCalled();
 
   // Called when a redirect notification occurs.
   void LoadRedirect(const GURL& old_url,
                     const GURL& new_url,
                     bool is_top_level);
 
   void AddWebViewToExtensionRendererState();
@@ skipping 69 matching lines @@
 
   // Main frame ID of last committed page.
   int64 main_frame_id_;
 
   // Set to |true| if ChromeVox was already injected in main frame.
   bool chromevox_injected_;
 
   // Stores the current zoom factor.
   double current_zoom_factor_;
 
+  // Stores the window name of the main frame of the guest.
+  std::string name_;
+
   // Handles find requests and replies for the webview find API.
   WebviewFindHelper find_helper_;
 
   // Handles the JavaScript dialog requests.
   JavaScriptDialogHelper javascript_dialog_helper_;
 
   friend void WebviewFindHelper::DispatchFindUpdateEvent(bool canceled,
                                                          bool final_update);
 
   // Holds the RenderViewContextMenu that has been built but yet to be
@@ skipping 18 matching lines @@
         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_