chrome/browser/ui/browser.cc - Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode

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

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased, most Android targets locally built successfully Created 4 years, 9 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

« chrome/browser/android/omnibox/autocomplete_controller_android.cc ('K') | « chrome/browser/ui/bookmarks/bookmark_utils.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm » ('j') | components/omnibox/browser/bookmark_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser.cc

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

index 297de4df16e9988eb2132ecb50db26fe36061c5f..b9fa2c022fa39f95c2f76ef242b30d1bb5f7cc44 100644

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

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

@@ -1632,10 +1632,8 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {

if (!GetStatusBubble())

return;

- if (source == tab_strip_model_->GetActiveWebContents()) {

- PrefService* prefs = profile_->GetPrefs();

- GetStatusBubble()->SetURL(url, prefs->GetString(prefs::kAcceptLanguages));

- }

+ if (source == tab_strip_model_->GetActiveWebContents())

+ GetStatusBubble()->SetURL(url);

}

void Browser::ContentsMouseEvent(WebContents* source,

@@ -1651,7 +1649,7 @@ void Browser::ContentsMouseEvent(WebContents* source,

if (source == tab_strip_model_->GetActiveWebContents()) {

GetStatusBubble()->MouseMoved(location, exited);

if (exited)

- GetStatusBubble()->SetURL(GURL(), std::string());

+ GetStatusBubble()->SetURL(GURL());

}