Remove ContentBrowserClient::GuestWebContentsAttached

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 70 matching lines @@
   // |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);
 
   // Set the zoom factor.
   void SetZoom(double zoom_factor);
 
   // GuestViewBase implementation.
-  virtual void Attach(content::WebContents* embedder_web_contents,
-                      const base::DictionaryValue& args) OVERRIDE;
+  virtual void DidAttachToEmbedder() OVERRIDE;
   virtual void DidStopLoading() OVERRIDE;
   virtual void EmbedderDestroyed() OVERRIDE;
   virtual void GuestDestroyed() OVERRIDE;
   virtual bool IsDragAndDropEnabled() const OVERRIDE;
+  virtual void WillAttachToEmbedder() OVERRIDE;
   virtual void WillDestroy() OVERRIDE;
 
   // WebContentsDelegate implementation.
   virtual bool AddMessageToConsole(content::WebContents* source,
                                    int32 level,
                                    const base::string16& message,
                                    int32 line_no,
                                    const base::string16& source_id) OVERRIDE;
   virtual void LoadProgressChanged(content::WebContents* source,
                                    double progress) OVERRIDE;
@@ skipping 37 matching lines @@
   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;
 
   // BrowserPluginGuestDelegate implementation.
-  virtual void DidAttach(const base::DictionaryValue& extra_params) OVERRIDE;
   virtual void SizeChanged(const gfx::Size& old_size, const gfx::Size& new_size)
       OVERRIDE;
   virtual void RequestPointerLockPermission(
       bool user_gesture,
       bool last_unlocked_by_target,
       const base::Callback<void(bool)>& callback) OVERRIDE;
-
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Returns the current zoom factor.
   double GetZoom();
 
   // Begin or continue a find request.
   void Find(const base::string16& search_text,
@@ skipping 276 matching lines @@
   // A counter to generate a unique request id for a permission request.
   // We only need the ids to be unique for a given WebViewGuest.
   int next_permission_request_id_;
 
   typedef std::map<int, PermissionResponseInfo> RequestMap;
   RequestMap pending_permission_requests_;
 
   // True if the user agent is overridden.
   bool is_overriding_user_agent_;
 
-  // Indicates that the page needs to be reloaded once it has been attached to
-  // an embedder.
-  bool pending_reload_on_attachment_;
-
   // 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.
@@ skipping 18 matching lines @@
       accessibility_subscription_;
 #endif
 
   std::map<int, int> bridge_id_to_request_id_map_;
 
   // Tracks the name, and target URL of the new window. Once the first
   // navigation commits, we no longer track this information.
   struct NewWindowInfo {
     GURL url;
     std::string name;
+    bool changed;
     NewWindowInfo(const GURL& url, const std::string& name) :
         url(url),
-        name(name) {}
+        name(name),
+        changed(false) {}
   };
 
   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_