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

Unified Diff: components/app_modal/javascript_dialog_manager.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: Compile fixes following rebase Created 5 years, 6 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: components/app_modal/javascript_dialog_manager.cc
diff --git a/components/app_modal/javascript_dialog_manager.cc b/components/app_modal/javascript_dialog_manager.cc
index 24ab262ae641fcd6aeae6e323c3bb475955360d6..5d20530609c941b061a2d1193a9e87cf07f3fb5a 100644
--- a/components/app_modal/javascript_dialog_manager.cc
+++ b/components/app_modal/javascript_dialog_manager.cc
@@ -12,6 +12,7 @@
#include "components/app_modal/javascript_dialog_extensions_client.h"
#include "components/app_modal/javascript_native_dialog_factory.h"
#include "components/app_modal/native_app_modal_dialog.h"
+#include "components/url_formatter/url_formatter.h"
#include "content/public/common/javascript_message_type.h"
#include "grit/components_strings.h"
#include "net/base/net_util.h"
@@ -209,7 +210,7 @@ base::string16 JavaScriptDialogManager::GetTitle(
// Otherwise, return the formatted URL.
// In this case, force URL to have LTR directionality.
- base::string16 url_string = net::FormatUrl(origin_url, accept_lang);
+ base::string16 url_string = url_formatter::FormatUrl(origin_url, accept_lang);
return l10n_util::GetStringFUTF16(
is_alert ? IDS_JAVASCRIPT_ALERT_TITLE
: IDS_JAVASCRIPT_MESSAGEBOX_TITLE,

Powered by Google App Engine
This is Rietveld 408576698