summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/BUILD.gn1
-rw-r--r--content/browser/DEPS1
-rw-r--r--content/browser/download/save_package.cc3
-rw-r--r--content/browser/frame_host/navigation_entry_impl.cc6
-rw-r--r--content/browser/web_contents/web_contents_impl.cc8
-rw-r--r--content/content_browser.gypi1
-rw-r--r--content/content_renderer.gypi1
-rw-r--r--content/content_shell.gypi1
-rw-r--r--content/renderer/BUILD.gn1
-rw-r--r--content/renderer/DEPS1
-rw-r--r--content/renderer/renderer_blink_platform_impl.cc4
-rw-r--r--content/shell/BUILD.gn1
-rw-r--r--content/shell/DEPS1
-rw-r--r--content/shell/browser/shell_javascript_dialog_manager.cc8
14 files changed, 14 insertions, 24 deletions
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 0c9d657..6281b91 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -23,7 +23,6 @@ source_set("browser") {
"//base",
"//base:base_static",
"//components/mime_util",
- "//components/url_formatter",
"//content:resources",
"//content/browser/background_sync:background_sync_proto",
"//content/browser/cache_storage:cache_storage_proto",
diff --git a/content/browser/DEPS b/content/browser/DEPS
index c3668d8..8baf02e 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -4,7 +4,6 @@ include_rules = [
"+components/mime_util",
"+components/scheduler/common",
"+components/tracing",
- "+components/url_formatter",
"+content/app/strings/grit", # For generated headers
"+content/public/browser",
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index 8b4fc11..f05c253 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -18,7 +18,6 @@
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread.h"
-#include "components/url_formatter/url_formatter.h"
#include "content/browser/download/download_item_impl.h"
#include "content/browser/download/download_manager_impl.h"
#include "content/browser/download/download_stats.h"
@@ -1215,7 +1214,7 @@ base::FilePath SavePackage::GetSuggestedNameForSaveAs(
// back to a URL, and if it matches the original page URL, we know the page
// had no title (or had a title equal to its URL, which is fine to treat
// similarly).
- if (title_ == url_formatter::FormatUrl(page_url_, accept_langs)) {
+ if (title_ == net::FormatUrl(page_url_, accept_langs)) {
std::string url_path;
if (!page_url_.SchemeIs(url::kDataScheme)) {
std::vector<std::string> url_parts;
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index 1e3b9e5..b51b7be0 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -9,10 +9,10 @@
#include "base/metrics/histogram.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/url_formatter/url_formatter.h"
#include "content/common/navigation_params.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/url_constants.h"
+#include "net/base/net_util.h"
#include "ui/gfx/text_elider.h"
// Use this to get a new unique ID for a NavigationEntry during construction.
@@ -222,9 +222,9 @@ const base::string16& NavigationEntryImpl::GetTitleForDisplay(
// Use the virtual URL first if any, and fall back on using the real URL.
base::string16 title;
if (!virtual_url_.is_empty()) {
- title = url_formatter::FormatUrl(virtual_url_, languages);
+ title = net::FormatUrl(virtual_url_, languages);
} else if (!GetURL().is_empty()) {
- title = url_formatter::FormatUrl(GetURL(), languages);
+ title = net::FormatUrl(GetURL(), languages);
}
// For file:// URLs use the filename as the title, not the full path.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 5de6232..f87a381 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -23,7 +23,6 @@
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "components/mime_util/mime_util.h"
-#include "components/url_formatter/url_formatter.h"
#include "content/browser/accessibility/accessibility_mode_helper.h"
#include "content/browser/accessibility/browser_accessibility_state_impl.h"
#include "content/browser/bad_message.h"
@@ -103,6 +102,7 @@
#include "content/public/common/web_preferences.h"
#include "mojo/common/url_type_converters.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
+#include "net/base/net_util.h"
#include "net/http/http_cache.h"
#include "net/http/http_transaction_factory.h"
#include "net/url_request/url_request_context.h"
@@ -4289,9 +4289,9 @@ void WebContentsImpl::LoadStateChanged(
load_state_ = load_state;
upload_position_ = upload_position;
upload_size_ = upload_size;
- load_state_host_ = url_formatter::IDNToUnicode(
- url.host(),
- GetContentClient()->browser()->GetAcceptLangs(GetBrowserContext()));
+ load_state_host_ = net::IDNToUnicode(url.host(),
+ GetContentClient()->browser()->GetAcceptLangs(
+ GetBrowserContext()));
if (load_state_.state == net::LOAD_STATE_READING_RESPONSE)
SetNotWaitingForResponse();
if (IsLoading()) {
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 29d76e4..0a4d7a7 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -5,7 +5,6 @@
{
'dependencies': [
'../base/base.gyp:base_static',
- '../components/url_formatter/url_formatter.gyp:url_formatter',
'../crypto/crypto.gyp:crypto',
'../device/battery/battery.gyp:device_battery',
'../device/battery/battery.gyp:device_battery_mojo_bindings',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 9a24f9e..99108c3 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -9,7 +9,6 @@
'../cc/cc.gyp:cc',
'../cc/blink/cc_blink.gyp:cc_blink',
'../components/scheduler/scheduler.gyp:scheduler',
- '../components/url_formatter/url_formatter.gyp:url_formatter',
'../device/battery/battery.gyp:device_battery',
'../device/battery/battery.gyp:device_battery_mojo_bindings',
'../device/vibration/vibration.gyp:device_vibration',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 21a6213..4ae18d1 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -52,7 +52,6 @@
'../components/components.gyp:web_cache_renderer',
'../components/components.gyp:plugins_renderer',
'../components/test_runner/test_runner.gyp:test_runner',
- '../components/url_formatter/url_formatter.gyp:url_formatter',
'../device/bluetooth/bluetooth.gyp:device_bluetooth',
'../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
'../gin/gin.gyp:gin',
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index e05fe03..e4a9a0b 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -28,7 +28,6 @@ source_set("renderer") {
"//base/allocator",
"//cc",
"//cc/blink",
- "//components/url_formatter",
"//components/scheduler:scheduler",
"//content:resources",
"//content/common:mojo_bindings",
diff --git a/content/renderer/DEPS b/content/renderer/DEPS
index 75024b9..5ea2ee7 100644
--- a/content/renderer/DEPS
+++ b/content/renderer/DEPS
@@ -2,7 +2,6 @@ include_rules = [
# Allow inclusion of specific components that we depend on. We may only
# depend on components which we share with the mojo html_viewer.
"+components/scheduler",
- "+components/url_formatter",
"+cc/blink",
"+content/public/child",
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index d787860..ed79baa 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -21,7 +21,6 @@
#include "components/scheduler/child/web_scheduler_impl.h"
#include "components/scheduler/renderer/renderer_scheduler.h"
#include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
-#include "components/url_formatter/url_formatter.h"
#include "content/child/database_util.h"
#include "content/child/file_info_util.h"
#include "content/child/fileapi/webfilesystem_impl.h"
@@ -70,6 +69,7 @@
#include "media/base/mime_util.h"
#include "media/blink/webcontentdecryptionmodule_impl.h"
#include "media/filters/stream_parser_factory.h"
+#include "net/base/net_util.h"
#include "storage/common/database/database_identifier.h"
#include "storage/common/quota/quota_types.h"
#include "third_party/WebKit/public/platform/WebBatteryStatusListener.h"
@@ -1033,7 +1033,7 @@ blink::WebCompositorSupport* RendererBlinkPlatformImpl::compositorSupport() {
blink::WebString RendererBlinkPlatformImpl::convertIDNToUnicode(
const blink::WebString& host,
const blink::WebString& languages) {
- return url_formatter::IDNToUnicode(host.utf8(), languages.utf8());
+ return net::IDNToUnicode(host.utf8(), languages.utf8());
}
//------------------------------------------------------------------------------
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 126d1c7..d5b4c1e 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -203,7 +203,6 @@ static_library("content_shell_lib") {
"//components/devtools_http_handler",
"//components/plugins/renderer",
"//components/test_runner:test_runner",
- "//components/url_formatter",
"//components/web_cache/renderer",
"//content:resources",
"//content/app/resources",
diff --git a/content/shell/DEPS b/content/shell/DEPS
index 067c10f..fadafc0 100644
--- a/content/shell/DEPS
+++ b/content/shell/DEPS
@@ -26,7 +26,6 @@ include_rules = [
"+components/crash",
"+components/devtools_discovery",
"+components/devtools_http_handler",
- "+components/url_formatter",
# For enabling media related features.
"+media/base/media_switches.h",
diff --git a/content/shell/browser/shell_javascript_dialog_manager.cc b/content/shell/browser/shell_javascript_dialog_manager.cc
index b6d8d0a..3eceb34 100644
--- a/content/shell/browser/shell_javascript_dialog_manager.cc
+++ b/content/shell/browser/shell_javascript_dialog_manager.cc
@@ -7,11 +7,11 @@
#include "base/command_line.h"
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/url_formatter/url_formatter.h"
#include "content/public/browser/web_contents.h"
#include "content/shell/browser/blink_test_controller.h"
#include "content/shell/browser/shell_javascript_dialog.h"
#include "content/shell/common/shell_switches.h"
+#include "net/base/net_util.h"
namespace content {
@@ -46,9 +46,9 @@ void ShellJavaScriptDialogManager::RunJavaScriptDialog(
return;
}
- base::string16 new_message_text =
- url_formatter::FormatUrl(origin_url, accept_lang) +
- base::ASCIIToUTF16("\n\n") + message_text;
+ base::string16 new_message_text = net::FormatUrl(origin_url, accept_lang) +
+ base::ASCIIToUTF16("\n\n") +
+ message_text;
gfx::NativeWindow parent_window = web_contents->GetTopLevelNativeWindow();
dialog_.reset(new ShellJavaScriptDialog(this,
generated by cgit v1.1 at 2024-08-16 15:24:28 +0000