chrome/browser/ui/search_engines/search_engine_tab_helper.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/search_engines/search_engine_tab_helper.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/pdf/pdf_browsertest.cc ('k') | chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.cc » ('j') | content/browser/tab_contents/navigation_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/search_engines/search_engine_tab_helper.cc

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

--- chrome/browser/ui/search_engines/search_engine_tab_helper.cc (revision 116232)

+++ chrome/browser/ui/search_engines/search_engine_tab_helper.cc (working copy)

@@ -11,8 +11,8 @@

#include "chrome/browser/search_engines/template_url_service_factory.h"

#include "chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h"

#include "chrome/common/render_messages.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/web_contents.h"

#include "content/public/common/frame_navigate_params.h"

@@ -92,7 +92,8 @@

return;

}

- const NavigationController& controller = web_contents()->GetController();

+ const content::NavigationController& controller =

+ web_contents()->GetController();

const NavigationEntry* entry = controller.GetLastCommittedEntry();

DCHECK(entry);

@@ -142,7 +143,8 @@

if (profile->IsOffTheRecord())

return;

- const NavigationController& controller = web_contents()->GetController();

+ const content::NavigationController& controller =

+ web_contents()->GetController();

int last_index = controller.GetLastCommittedEntryIndex();

// When there was no previous page, the last index will be 0. This is

// normally due to a form submit that opened in a new tab.