chrome/browser/ui/toolbar/toolbar_model.cc - Issue 7464009: Removal of Profile from content part 1.

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/toolbar_model.cc

Issue 7464009: Removal of Profile from content part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: works now Created 9 years, 5 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:

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

diff --git a/chrome/browser/ui/toolbar/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc

index 24a1330a1f39ff7dedc47711957be2c58700829f..342a5c0b25843966696b5a6e489515ba8c099426 100644

--- a/chrome/browser/ui/toolbar/toolbar_model.cc

+++ b/chrome/browser/ui/toolbar/toolbar_model.cc

@@ -40,8 +40,8 @@ std::wstring ToolbarModel::GetText() const {

NavigationController* navigation_controller = GetNavigationController();

if (navigation_controller) {

- languages = navigation_controller->profile()->GetPrefs()->GetString(

- prefs::kAcceptLanguages);

+ Profile* profile = static_cast<Profile*>(navigation_controller->context());

+ languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);

NavigationEntry* entry = navigation_controller->GetActiveEntry();

if (!navigation_controller->tab_contents()->ShouldDisplayURL()) {

// Explicitly hide the URL for this tab.