diff options
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/common/shell_content_client.cc | 2 | ||||
| -rw-r--r-- | content/shell/common/webkit_test_helpers.cc | 2 | ||||
| -rw-r--r-- | content/shell/geolocation/shell_access_token_store.cc | 2 | ||||
| -rw-r--r-- | content/shell/renderer/webkit_test_runner.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_aura.cc | 4 | ||||
| -rw-r--r-- | content/shell/shell_browser_main.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_download_manager_delegate.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_gtk.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_javascript_dialog_gtk.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_javascript_dialog_manager.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_login_dialog.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_login_dialog_gtk.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_plugin_service_filter.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_win.cc | 2 | ||||
| -rw-r--r-- | content/shell/webkit_test_platform_support_win.cc | 2 |
16 files changed, 17 insertions, 17 deletions
diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc index 6486e39..495ad85 100644 --- a/content/shell/common/shell_content_client.cc +++ b/content/shell/common/shell_content_client.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/common/content_switches.h" #include "content/shell/common/shell_switches.h" #include "grit/shell_resources.h" diff --git a/content/shell/common/webkit_test_helpers.cc b/content/shell/common/webkit_test_helpers.cc index 2417dc1..c158ed4 100644 --- a/content/shell/common/webkit_test_helpers.cc +++ b/content/shell/common/webkit_test_helpers.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/shell/common/shell_switches.h" #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h" #include "webkit/common/webpreferences.h" diff --git a/content/shell/geolocation/shell_access_token_store.cc b/content/shell/geolocation/shell_access_token_store.cc index 2c011cd2..d101c0f 100644 --- a/content/shell/geolocation/shell_access_token_store.cc +++ b/content/shell/geolocation/shell_access_token_store.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_thread.h" #include "content/shell/shell_browser_context.h" diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc index 34ec646..7501854 100644 --- a/content/shell/renderer/webkit_test_runner.cc +++ b/content/shell/renderer/webkit_test_runner.cc @@ -16,8 +16,8 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "content/public/renderer/history_item_serialization.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_visitor.h" diff --git a/content/shell/shell.cc b/content/shell/shell.cc index d1e691b..a921a30 100644 --- a/content/shell/shell.cc +++ b/content/shell/shell.cc @@ -11,7 +11,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/devtools_manager.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc index 06fcaa0..2bae9a7 100644 --- a/content/shell/shell_aura.cc +++ b/content/shell/shell_aura.cc @@ -5,7 +5,7 @@ #include "content/shell/shell.h" #include "base/command_line.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "ui/aura/env.h" @@ -22,8 +22,8 @@ #include "ui/views/controls/webview/webview.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/layout/grid_layout.h" -#include "ui/views/view.h" #include "ui/views/test/desktop_test_views_delegate.h" +#include "ui/views/view.h" #include "ui/views/widget/desktop_aura/desktop_screen.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc index 325795a..465b10c 100644 --- a/content/shell/shell_browser_main.cc +++ b/content/shell/shell_browser_main.cc @@ -14,8 +14,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/strings/sys_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" -#include "base/utf_string_conversions.h" #include "content/public/browser/browser_main_runner.h" #include "content/shell/common/shell_switches.h" #include "content/shell/common/webkit_test_helpers.h" diff --git a/content/shell/shell_download_manager_delegate.cc b/content/shell/shell_download_manager_delegate.cc index e445df0..e3e0417 100644 --- a/content/shell/shell_download_manager_delegate.cc +++ b/content/shell/shell_download_manager_delegate.cc @@ -18,7 +18,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" diff --git a/content/shell/shell_gtk.cc b/content/shell/shell_gtk.cc index 6082cf4..ee77473 100644 --- a/content/shell/shell_gtk.cc +++ b/content/shell/shell_gtk.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/strings/string_piece.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/web_contents.h" diff --git a/content/shell/shell_javascript_dialog_gtk.cc b/content/shell/shell_javascript_dialog_gtk.cc index 542048e..13ee8c7 100644 --- a/content/shell/shell_javascript_dialog_gtk.cc +++ b/content/shell/shell_javascript_dialog_gtk.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/shell/app/resource.h" #include "content/shell/shell.h" #include "content/shell/shell_javascript_dialog_manager.h" diff --git a/content/shell/shell_javascript_dialog_manager.cc b/content/shell/shell_javascript_dialog_manager.cc index da4c892..5e528d8 100644 --- a/content/shell/shell_javascript_dialog_manager.cc +++ b/content/shell/shell_javascript_dialog_manager.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/shell/common/shell_switches.h" diff --git a/content/shell/shell_login_dialog.cc b/content/shell/shell_login_dialog.cc index 4e20fb6..f32c427 100644 --- a/content/shell/shell_login_dialog.cc +++ b/content/shell/shell_login_dialog.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/resource_dispatcher_host.h" #include "net/base/auth.h" diff --git a/content/shell/shell_login_dialog_gtk.cc b/content/shell/shell_login_dialog_gtk.cc index 1748f04..4eb6faf 100644 --- a/content/shell/shell_login_dialog_gtk.cc +++ b/content/shell/shell_login_dialog_gtk.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/string16.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/resource_dispatcher_host.h" diff --git a/content/shell/shell_plugin_service_filter.cc b/content/shell/shell_plugin_service_filter.cc index 516c5c2..31f080c 100644 --- a/content/shell/shell_plugin_service_filter.cc +++ b/content/shell/shell_plugin_service_filter.cc @@ -4,7 +4,7 @@ #include "content/shell/shell_plugin_service_filter.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "webkit/plugins/webplugininfo.h" namespace content { diff --git a/content/shell/shell_win.cc b/content/shell/shell_win.cc index b6e85c6..d6d9497 100644 --- a/content/shell/shell_win.cc +++ b/content/shell/shell_win.cc @@ -9,7 +9,7 @@ #include <io.h> #include <windows.h> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/wrapped_window_proc.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" diff --git a/content/shell/webkit_test_platform_support_win.cc b/content/shell/webkit_test_platform_support_win.cc index a77abc8..df9faf2 100644 --- a/content/shell/webkit_test_platform_support_win.cc +++ b/content/shell/webkit_test_platform_support_win.cc @@ -13,7 +13,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #define SIZEOF_STRUCT_WITH_SPECIFIED_LAST_MEMBER(struct_name, member) \ offsetof(struct_name, member) + \ |