chrome/browser/media/media_stream_capture_indicator.cc - Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components

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/media/media_stream_capture_indicator.cc

Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase again now that CQ is fixed Created 5 years, 4 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/interstitials/security_interstitial_page.cc ('k') | chrome/browser/media/midi_permission_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_stream_capture_indicator.cc

diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc

index 978e0e8ff849b2ab4e9bf4f6de1937707d9094bf..0c91b5bca8c84c452c346baf0524682ab8a8f8b4 100644

--- a/chrome/browser/media/media_stream_capture_indicator.cc

+++ b/chrome/browser/media/media_stream_capture_indicator.cc

@@ -18,13 +18,13 @@

#include "chrome/browser/tab_contents/tab_util.h"

#include "chrome/common/pref_names.h"

#include "chrome/grit/chromium_strings.h"

+#include "components/url_formatter/url_formatter.h"

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

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

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

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

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

#include "grit/theme_resources.h"

-#include "net/base/net_util.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/image/image_skia.h"

@@ -112,7 +112,8 @@ base::string16 GetTitle(WebContents* web_contents) {

Profile::FromBrowserContext(web_contents->GetBrowserContext());

std::string languages =

profile->GetPrefs()->GetString(prefs::kAcceptLanguages);

- if (tab_title == net::FormatUrl(web_contents->GetURL(), languages))

+ if (tab_title ==

+ url_formatter::FormatUrl(web_contents->GetURL(), languages))

tab_title = GetSecurityOrigin(web_contents);

}