Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(728)

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: 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/DEPS ('k') | chrome/browser/android/omnibox/autocomplete_controller_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698