chrome/browser/ui/toolbar/back_forward_menu_model.cc - 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: chrome/browser/ui/toolbar/back_forward_menu_model.cc

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

« no previous file with comments | « chrome/browser/ui/tab_modal_confirm_dialog_delegate.cc ('k') | chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc » ('j') | content/browser/tab_contents/navigation_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/back_forward_menu_model.cc

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

--- chrome/browser/ui/toolbar/back_forward_menu_model.cc (revision 116232)

+++ chrome/browser/ui/toolbar/back_forward_menu_model.cc (working copy)

@@ -16,8 +16,8 @@

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

-#include "content/browser/tab_contents/navigation_controller.h"

#include "content/public/browser/favicon_status.h"

+#include "content/public/browser/navigation_controller.h"

#include "content/public/browser/navigation_entry.h"

#include "content/public/browser/user_metrics.h"

#include "content/public/browser/web_contents.h"

@@ -335,7 +335,7 @@

int BackForwardMenuModel::GetIndexOfNextChapterStop(int start_from,

bool forward) const {

WebContents* contents = GetWebContents();

- NavigationController& controller = contents->GetController();

+ content::NavigationController& controller = contents->GetController();

int max_count = controller.GetEntryCount();

if (start_from < 0 || start_from >= max_count)

@@ -445,7 +445,7 @@

NavigationEntry* BackForwardMenuModel::GetNavigationEntry(int index) const {

int controller_index = MenuIndexToNavEntryIndex(index);

- NavigationController& controller = GetWebContents()->GetController();

+ content::NavigationController& controller = GetWebContents()->GetController();

if (controller_index >= 0 && controller_index < controller.GetEntryCount())

return controller.GetEntryAtIndex(controller_index);