diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 07:53:47 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 07:53:47 +0000 |
| commit | d202a7c07fad32d83cd8c640ca03eafd36856881 (patch) | |
| tree | fc805fb8fa9ab6907f54ae7a3b3955298470d8b5 /content/browser/tab_contents/tab_contents.h | |
| parent | 9dc034d24c21816b763f51a50d53008237fd9da6 (diff) | |
| download | chromium_src-d202a7c07fad32d83cd8c640ca03eafd36856881.zip chromium_src-d202a7c07fad32d83cd8c640ca03eafd36856881.tar.gz chromium_src-d202a7c07fad32d83cd8c640ca03eafd36856881.tar.bz2 | |
Rename NavigationController to NavigationControllerImpl. I'll get rid of content::NavigationController in a separate change.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9091002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tab_contents/tab_contents.h')
| -rw-r--r-- | content/browser/tab_contents/tab_contents.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 0904d33..504ac90 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -18,7 +18,7 @@ #include "content/browser/javascript_dialogs.h" #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h" #include "content/browser/renderer_host/render_view_host_delegate.h" -#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_controller_impl.h" #include "content/browser/tab_contents/render_view_host_manager.h" #include "content/common/content_export.h" #include "content/public/browser/web_contents.h" @@ -119,7 +119,7 @@ class CONTENT_EXPORT TabContents } // Like GetController from WebContents, but returns the concrete object. - NavigationController& GetControllerImpl(); + NavigationControllerImpl& GetControllerImpl(); // content::WebContents ------------------------------------------------------ virtual const base::PropertyBag* GetPropertyBag() const OVERRIDE; @@ -326,7 +326,7 @@ class CONTENT_EXPORT TabContents RenderViewHost* render_view_host) OVERRIDE; virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE; virtual void NotifySwappedFromRenderManager() OVERRIDE; - virtual NavigationController& GetControllerForRenderManager() OVERRIDE; + virtual NavigationControllerImpl& GetControllerForRenderManager() OVERRIDE; virtual WebUI* CreateWebUIForRenderManager(const GURL& url) OVERRIDE; virtual content::NavigationEntry* GetLastCommittedNavigationEntryForRenderManager() OVERRIDE; @@ -352,7 +352,7 @@ class CONTENT_EXPORT TabContents void RemoveObserver(content::WebContentsObserver* observer); private: - friend class NavigationController; + friend class NavigationControllerImpl; FRIEND_TEST_ALL_PREFIXES(TabContentsTest, NoJSMessageOnInterstitials); FRIEND_TEST_ALL_PREFIXES(TabContentsTest, UpdateTitle); @@ -505,7 +505,7 @@ class CONTENT_EXPORT TabContents content::WebContentsDelegate* delegate_; // Handles the back/forward list and loading. - NavigationController controller_; + NavigationControllerImpl controller_; // The corresponding view. scoped_ptr<TabContentsView> view_; |