Index: chrome/browser/character_encoding.cc |
diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc |
index c8bdb74ce0325b9b90bf426b6021a9b74acbf397..7875685d777d8bb8030e493a389c24d5bfae9fe4 100644 |
--- a/chrome/browser/character_encoding.cc |
+++ b/chrome/browser/character_encoding.cc |
@@ -9,8 +9,8 @@ |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
-#include "base/string_tokenizer.h" |
#include "base/string_util.h" |
+#include "base/strings/string_tokenizer.h" |
viettrungluu
2013/02/01 17:54:15
...
|
#include "base/utf_string_conversions.h" |
#include "chrome/app/chrome_command_ids.h" |
#include "content/public/browser/browser_thread.h" |
@@ -241,7 +241,7 @@ const int kDefaultEncodingMenusLength = arraysize(kDefaultEncodingMenus); |
void ParseEncodingListSeparatedWithComma( |
const std::string& encoding_list, std::vector<int>* const available_list, |
size_t maximum_size) { |
- StringTokenizer tokenizer(encoding_list, ","); |
+ base::StringTokenizer tokenizer(encoding_list, ","); |
while (tokenizer.GetNext()) { |
int id = CharacterEncoding::GetCommandIdByCanonicalEncodingName( |
tokenizer.token()); |