diff options
Diffstat (limited to 'content/shell/browser/shell_javascript_dialog_manager.cc')
| -rw-r--r-- | content/shell/browser/shell_javascript_dialog_manager.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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, |