chrome/browser/android/fullscreen/fullscreen_infobar_delegate.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/android/fullscreen/fullscreen_infobar_delegate.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: Fold in secure_display to url_formatter Created 5 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc

diff --git a/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc b/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc

index 73178ff4e72e24f57ab365f7d3af21663352c80f..04d0ab359586f089979221ed4653d78790e485bf 100644

--- a/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc

+++ b/chrome/browser/android/fullscreen/fullscreen_infobar_delegate.cc

@@ -13,10 +13,10 @@

#include "chrome/common/pref_names.h"

#include "chrome/grit/generated_resources.h"

#include "components/infobars/core/infobar.h"

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

#include "grit/components_strings.h"

#include "grit/theme_resources.h"

#include "jni/FullscreenInfoBarDelegate_jni.h"

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

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

#include "url/gurl.h"

@@ -69,7 +69,8 @@ base::string16 FullscreenInfoBarDelegate::GetMessageText() const {

std::string language =

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

return l10n_util::GetStringFUTF16(

- IDS_FULLSCREEN_INFOBAR_TEXT, net::FormatUrl(GURL(origin_), language));

+ IDS_FULLSCREEN_INFOBAR_TEXT,

+ url_formatter::FormatUrl(GURL(origin_), language));

}

base::string16 FullscreenInfoBarDelegate::GetButtonLabel(

« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/android/omnibox/autocomplete_controller_android.cc » ('j') | components/url_formatter/DEPS » ('J')