From 2db9bd7f4d790d11f25f6f6e4aef9fc731b2424e Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Fri, 13 Apr 2012 20:20:56 +0000 Subject: TabContents -> WebContentsImpl, part 12. "Detab" content/browser/web_contents. BUG=105875 TEST=no change Review URL: http://codereview.chromium.org/10038026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132257 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/web_contents/navigation_controller_impl.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'content/browser/web_contents/navigation_controller_impl.h') diff --git a/content/browser/web_contents/navigation_controller_impl.h b/content/browser/web_contents/navigation_controller_impl.h index 71f1f52..dfe4dd6 100644 --- a/content/browser/web_contents/navigation_controller_impl.h +++ b/content/browser/web_contents/navigation_controller_impl.h @@ -28,7 +28,7 @@ class CONTENT_EXPORT NavigationControllerImpl : public NON_EXPORTED_BASE(content::NavigationController) { public: NavigationControllerImpl( - WebContentsImpl* tab_contents, + WebContentsImpl* web_contents, content::BrowserContext* browser_context, SessionStorageNamespaceImpl* session_storage_namespace); virtual ~NavigationControllerImpl(); @@ -124,10 +124,8 @@ class CONTENT_EXPORT NavigationControllerImpl // WebContentsImpl ----------------------------------------------------------- - WebContentsImpl* tab_contents() const { - // This currently returns the active tab contents which should be renamed to - // tab_contents. - return tab_contents_; + WebContentsImpl* web_contents() const { + return web_contents_; } // Called when a document has been loaded in a frame. @@ -298,9 +296,9 @@ class CONTENT_EXPORT NavigationControllerImpl // after the transient entry will become invalid if you navigate forward. int transient_entry_index_; - // The tab contents associated with the controller. Possibly NULL during + // The WebContents associated with the controller. Possibly NULL during // setup. - WebContentsImpl* tab_contents_; + WebContentsImpl* web_contents_; // The max restored page ID in this controller, if it was restored. We must // store this so that WebContentsImpl can tell any renderer in charge of one -- cgit v1.1