Simplify WebNavigationApi by using RenderFrameHost internally.

chrome/browser/extensions/api/web_navigation/web_navigation_api.h

 // Copyright (c) 2012 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.
 
 // Defines the Chrome Extensions WebNavigation API functions for observing and
 // intercepting navigation events, as specified in the extension JSON API.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_
 
@@ skipping 34 matching lines @@
   }
 
   content::RenderViewHost* GetRenderViewHostInProcess(int process_id) const;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // content::WebContentsObserver implementation.
+  virtual void RenderFrameDeleted(
+      content::RenderFrameHost* render_frame_host) OVERRIDE;
   virtual void RenderViewDeleted(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void AboutToNavigateRenderView(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidStartProvisionalLoadForFrame(
       content::RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       bool is_error_page,
       bool is_iframe_srcdoc) OVERRIDE;
   virtual void DidCommitProvisionalLoadForFrame(
@@ skipping 15 matching lines @@
                            const base::string16& error_description) OVERRIDE;
   virtual void DidGetRedirectForResourceRequest(
       content::RenderViewHost* render_view_host,
       const content::ResourceRedirectDetails& details) OVERRIDE;
   virtual void DidOpenRequestedURL(content::WebContents* new_contents,
                                    const GURL& url,
                                    const content::Referrer& referrer,
                                    WindowOpenDisposition disposition,
                                    content::PageTransition transition,
                                    int64 source_frame_num) OVERRIDE;
-  virtual void FrameDetached(
-      content::RenderFrameHost* render_view_host) OVERRIDE;
   virtual void WebContentsDestroyed() OVERRIDE;
 
  private:
   explicit WebNavigationTabObserver(content::WebContents* web_contents);
   friend class content::WebContentsUserData<WebNavigationTabObserver>;
 
   // True if the transition and target url correspond to a reference fragment
   // navigation.
-  bool IsReferenceFragmentNavigation(FrameNavigationState::FrameID frame_id,
+  bool IsReferenceFragmentNavigation(content::RenderFrameHost* frame_host,
                                      const GURL& url);
 
   // Creates and sends onErrorOccurred events for all on-going navigations. If
   // |render_view_host| is non-NULL, only generates events for frames in this
-  // render view host. If |id_to_skip| is given, no events are sent for that
+  // render view host. If |frame_host_to_skip| is given, no events are sent for
+  // that
   // frame.
   void SendErrorEvents(content::WebContents* web_contents,
                        content::RenderViewHost* render_view_host,
-                       FrameNavigationState::FrameID id_to_skip);
+                       content::RenderFrameHost* frame_host_to_skip);
 
   // Tracks the state of the frames we are sending events for.
   FrameNavigationState navigation_state_;
 
   // Used for tracking registrations to redirect notifications.
   content::NotificationRegistrar registrar_;
 
   // The current RenderViewHost of the observed WebContents.
   content::RenderViewHost* render_view_host_;
 
@@ skipping 11 matching lines @@
                                  public content::NotificationObserver {
  public:
   explicit WebNavigationEventRouter(Profile* profile);
   virtual ~WebNavigationEventRouter();
 
  private:
   // Used to cache the information about newly created WebContents objects.
   struct PendingWebContents{
     PendingWebContents();
     PendingWebContents(content::WebContents* source_web_contents,
-                       int64 source_frame_id,
-                       bool source_frame_is_main_frame,
+                       content::RenderFrameHost* source_frame_host,
                        content::WebContents* target_web_contents,
                        const GURL& target_url);
     ~PendingWebContents();
 
     content::WebContents* source_web_contents;
-    int64 source_frame_id;
-    bool source_frame_is_main_frame;
+    content::RenderFrameHost* source_frame_host;
     content::WebContents* target_web_contents;
     GURL target_url;
   };
 
   // TabStripModelObserver implementation.
   virtual void TabReplacedAt(TabStripModel* tab_strip_model,
                              content::WebContents* old_contents,
                              content::WebContents* new_contents,
                              int index) OVERRIDE;
 
@@ skipping 76 matching lines @@
 
   // Created lazily upon OnListenerAdded.
   scoped_ptr<WebNavigationEventRouter> web_navigation_event_router_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNavigationAPI);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_