Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7045)

Unified Diff: chrome/test/chromedriver/key_converter.cc

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/chromedriver/key_converter.h ('k') | chrome/test/chromedriver/key_converter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/key_converter.cc
diff --git a/chrome/test/chromedriver/key_converter.cc b/chrome/test/chromedriver/key_converter.cc
index c9eba3662f3380a94e3a712f6f219e7519e2d5ce..57f98a401d4bc4d25880e0b2a87a9078fc897f1a 100644
--- a/chrome/test/chromedriver/key_converter.cc
+++ b/chrome/test/chromedriver/key_converter.cc
@@ -139,7 +139,7 @@ bool KeyCodeFromSpecialWebDriverKey(char16 key, ui::KeyboardCode* key_code) {
bool KeyCodeFromShorthandKey(char16 key_utf16,
ui::KeyboardCode* key_code,
bool* client_should_skip) {
- string16 key_str_utf16;
+ base::string16 key_str_utf16;
key_str_utf16.push_back(key_utf16);
std::string key_str_utf8 = UTF16ToUTF8(key_str_utf16);
if (key_str_utf8.length() != 1)
@@ -186,13 +186,13 @@ KeyEvent CreateCharEvent(const std::string& unmodified_text,
ui::VKEY_UNKNOWN);
}
-Status ConvertKeysToKeyEvents(const string16& client_keys,
+Status ConvertKeysToKeyEvents(const base::string16& client_keys,
bool release_modifiers,
int* modifiers,
std::list<KeyEvent>* client_key_events) {
std::list<KeyEvent> key_events;
- string16 keys = client_keys;
+ base::string16 keys = client_keys;
// Add an implicit NULL character to the end of the input to depress all
// modifiers.
if (release_modifiers)
« no previous file with comments | « chrome/test/chromedriver/key_converter.h ('k') | chrome/test/chromedriver/key_converter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698