content/browser/tab_contents/tab_contents.h - Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/tab_contents/tab_contents.h

Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac Created 8 years, 12 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/tab_contents/navigation_controller.cc ('K') | « content/browser/tab_contents/navigation_controller_unittest.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/tab_contents/tab_contents.h

===================================================================

--- content/browser/tab_contents/tab_contents.h (revision 116232)

+++ content/browser/tab_contents/tab_contents.h (working copy)

@@ -118,13 +118,16 @@

return java_bridge_dispatcher_host_manager_.get();

}

+ // Like GetController from WebContents, but returns the concrete object.

+ NavigationController& GetControllerImpl();

// content::WebContents ------------------------------------------------------

virtual const base::PropertyBag* GetPropertyBag() const OVERRIDE;

virtual base::PropertyBag* GetPropertyBag() OVERRIDE;

virtual content::WebContentsDelegate* GetDelegate() OVERRIDE;

virtual void SetDelegate(content::WebContentsDelegate* delegate) OVERRIDE;

- virtual NavigationController& GetController() OVERRIDE;

- virtual const NavigationController& GetController() const OVERRIDE;

+ virtual content::NavigationController& GetController() OVERRIDE;

+ virtual const content::NavigationController& GetController() const OVERRIDE;

virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;

virtual void SetViewType(content::ViewType type) OVERRIDE;

virtual content::ViewType GetViewType() const OVERRIDE;