diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 22:40:45 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 22:40:45 +0000 |
| commit | 906265870c8a3cc44ebbcad14eaea84559a49aed (patch) | |
| tree | fc025f2e228464be651f0ea502fb7415467e8278 /webkit/glue | |
| parent | 3aef722b8c533efc87df683a454f0779f9b6cabb (diff) | |
| download | chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.zip chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.tar.gz chromium_src-906265870c8a3cc44ebbcad14eaea84559a49aed.tar.bz2 | |
Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, printing/, remoting/, rlz/, skia/, sql/, sync/, third_party/, tools/, webkit/, win8/.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15995038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/ftp_directory_listing_response_delegate.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/glue_serialize_deprecated.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/simple_webmimeregistry_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webclipboard_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webkitplatformsupport_impl.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/webkit/glue/ftp_directory_listing_response_delegate.cc b/webkit/glue/ftp_directory_listing_response_delegate.cc index dd56ce4..d32389f 100644 --- a/webkit/glue/ftp_directory_listing_response_delegate.cc +++ b/webkit/glue/ftp_directory_listing_response_delegate.cc @@ -11,8 +11,8 @@ #include "base/logging.h" #include "base/string_util.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 "net/base/escape.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/webkit/glue/glue_serialize_deprecated.cc b/webkit/glue/glue_serialize_deprecated.cc index 0582801..750a46f 100644 --- a/webkit/glue/glue_serialize_deprecated.cc +++ b/webkit/glue/glue_serialize_deprecated.cc @@ -7,7 +7,7 @@ #include <string> #include "base/pickle.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebHTTPBody.h" diff --git a/webkit/glue/simple_webmimeregistry_impl.cc b/webkit/glue/simple_webmimeregistry_impl.cc index fcf7b4f..799dfec 100644 --- a/webkit/glue/simple_webmimeregistry_impl.cc +++ b/webkit/glue/simple_webmimeregistry_impl.cc @@ -6,7 +6,7 @@ #include "base/string_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "media/filters/stream_parser_factory.h" #include "net/base/mime_util.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index 85c6e2d..026dcf1 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/pickle.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "third_party/WebKit/public/platform/WebData.h" diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 6485e58..7a534ea 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -25,8 +25,8 @@ #include "base/stringprintf.h" #include "base/strings/string_piece.h" #include "base/strings/string_tokenizer.h" +#include "base/strings/utf_string_conversions.h" #include "base/sys_info.h" -#include "base/utf_string_conversions.h" #include "net/base/escape.h" #include "net/url_request/url_request.h" #include "skia/ext/platform_canvas.h" diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index 850041b..00208bb 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -21,10 +21,10 @@ #include "base/rand_util.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/sys_info.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "grit/webkit_chromium_resources.h" #include "grit/webkit_resources.h" #include "grit/webkit_strings.h" |