diff options
Diffstat (limited to 'chrome/test')
18 files changed, 18 insertions, 18 deletions
diff --git a/chrome/test/automation/automation_json_requests.h b/chrome/test/automation/automation_json_requests.h index 6f8a5f3..8abd32ac 100644 --- a/chrome/test/automation/automation_json_requests.h +++ b/chrome/test/automation/automation_json_requests.h @@ -14,7 +14,7 @@ #include "base/strings/string_number_conversions.h" #include "chrome/common/automation_constants.h" #include "chrome/common/automation_id.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" class AutomationMessageSender; diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h index ed8b12d..a4cbd2c 100644 --- a/chrome/test/automation/tab_proxy.h +++ b/chrome/test/automation/tab_proxy.h @@ -23,8 +23,8 @@ #include "content/public/common/page_type.h" #include "content/public/common/security_style.h" #include "net/cert/cert_status_flags.h" -#include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/window_open_disposition.h" +#include "ui/events/keycodes/keyboard_codes.h" class BrowserProxy; class GURL; diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h index 135d9a9..949611e 100644 --- a/chrome/test/base/ui_test_utils.h +++ b/chrome/test/base/ui_test_utils.h @@ -21,8 +21,8 @@ #include "content/public/browser/notification_source.h" #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/window_open_disposition.h" +#include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/native_widget_types.h" #include "url/gurl.h" diff --git a/chrome/test/chromedriver/chrome/ui_events.h b/chrome/test/chromedriver/chrome/ui_events.h index 84c1561..88138dc 100644 --- a/chrome/test/chromedriver/chrome/ui_events.h +++ b/chrome/test/chromedriver/chrome/ui_events.h @@ -7,7 +7,7 @@ #include <string> -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" // Specifies the type of the mouse event. enum MouseEventType { diff --git a/chrome/test/chromedriver/key_converter.h b/chrome/test/chromedriver/key_converter.h index 6f647bcb..4cbb0b4 100644 --- a/chrome/test/chromedriver/key_converter.h +++ b/chrome/test/chromedriver/key_converter.h @@ -9,7 +9,7 @@ #include <string> #include "base/strings/string16.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" struct KeyEvent; class Status; diff --git a/chrome/test/chromedriver/keycode_text_conversion.h b/chrome/test/chromedriver/keycode_text_conversion.h index 587bdaf..294a8b7 100644 --- a/chrome/test/chromedriver/keycode_text_conversion.h +++ b/chrome/test/chromedriver/keycode_text_conversion.h @@ -8,7 +8,7 @@ #include <string> #include "base/strings/string16.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" // These functions only support conversion of characters in the BMP // (Basic Multilingual Plane). diff --git a/chrome/test/chromedriver/keycode_text_conversion_mac.mm b/chrome/test/chromedriver/keycode_text_conversion_mac.mm index d83df65..ed00190 100644 --- a/chrome/test/chromedriver/keycode_text_conversion_mac.mm +++ b/chrome/test/chromedriver/keycode_text_conversion_mac.mm @@ -11,7 +11,7 @@ #include "base/mac/scoped_cftyperef.h" #include "base/strings/utf_string_conversions.h" #include "chrome/test/chromedriver/chrome/ui_events.h" -#include "ui/base/keycodes/keyboard_code_conversion_mac.h" +#include "ui/events/keycodes/keyboard_code_conversion_mac.h" bool ConvertKeyCodeToText( ui::KeyboardCode key_code, int modifiers, std::string* text, diff --git a/chrome/test/chromedriver/keycode_text_conversion_unittest.cc b/chrome/test/chromedriver/keycode_text_conversion_unittest.cc index db3cc35..f13ca21 100644 --- a/chrome/test/chromedriver/keycode_text_conversion_unittest.cc +++ b/chrome/test/chromedriver/keycode_text_conversion_unittest.cc @@ -10,7 +10,7 @@ #include "chrome/test/chromedriver/keycode_text_conversion.h" #include "chrome/test/chromedriver/test_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" namespace { diff --git a/chrome/test/chromedriver/keycode_text_conversion_x.cc b/chrome/test/chromedriver/keycode_text_conversion_x.cc index 31c502f..349c431 100644 --- a/chrome/test/chromedriver/keycode_text_conversion_x.cc +++ b/chrome/test/chromedriver/keycode_text_conversion_x.cc @@ -12,8 +12,8 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/test/chromedriver/chrome/ui_events.h" -#include "ui/base/keycodes/keyboard_code_conversion_x.h" #include "ui/base/x/x11_util.h" +#include "ui/events/keycodes/keyboard_code_conversion_x.h" namespace { diff --git a/chrome/test/reliability/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc index e59f436..5348e60 100644 --- a/chrome/test/reliability/automated_ui_tests.cc +++ b/chrome/test/reliability/automated_ui_tests.cc @@ -36,7 +36,7 @@ #include "chrome/test/automation/window_proxy.h" #include "chrome/test/reliability/automated_ui_tests.h" #include "chrome/test/ui/ui_test.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" #include "url/gurl.h" #if defined(TOOLKIT_VIEWS) diff --git a/chrome/test/reliability/automated_ui_tests.h b/chrome/test/reliability/automated_ui_tests.h index 06cd21f..4cb6055 100644 --- a/chrome/test/reliability/automated_ui_tests.h +++ b/chrome/test/reliability/automated_ui_tests.h @@ -105,7 +105,7 @@ #include "chrome/test/reliability/automated_ui_test_base.h" #include "chrome/test/ui/ui_test.h" #include "third_party/libxml/chromium/libxml_utils.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" namespace base { class Time; diff --git a/chrome/test/webdriver/keycode_text_conversion.h b/chrome/test/webdriver/keycode_text_conversion.h index c1f7e33..34711d9 100644 --- a/chrome/test/webdriver/keycode_text_conversion.h +++ b/chrome/test/webdriver/keycode_text_conversion.h @@ -8,7 +8,7 @@ #include <string> #include "base/strings/string16.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" namespace webdriver { diff --git a/chrome/test/webdriver/keycode_text_conversion_gtk.cc b/chrome/test/webdriver/keycode_text_conversion_gtk.cc index b3eb12c..c3b1151f 100644 --- a/chrome/test/webdriver/keycode_text_conversion_gtk.cc +++ b/chrome/test/webdriver/keycode_text_conversion_gtk.cc @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/automation_constants.h" -#include "ui/base/keycodes/keyboard_code_conversion_gtk.h" +#include "ui/events/keycodes/keyboard_code_conversion_gtk.h" namespace webdriver { diff --git a/chrome/test/webdriver/keycode_text_conversion_mac.mm b/chrome/test/webdriver/keycode_text_conversion_mac.mm index aa2e424..19c77f4 100644 --- a/chrome/test/webdriver/keycode_text_conversion_mac.mm +++ b/chrome/test/webdriver/keycode_text_conversion_mac.mm @@ -11,7 +11,7 @@ #include "base/mac/scoped_cftyperef.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/automation_constants.h" -#include "ui/base/keycodes/keyboard_code_conversion_mac.h" +#include "ui/events/keycodes/keyboard_code_conversion_mac.h" namespace webdriver { diff --git a/chrome/test/webdriver/keycode_text_conversion_unittest.cc b/chrome/test/webdriver/keycode_text_conversion_unittest.cc index 0b53c7a..627cd68 100644 --- a/chrome/test/webdriver/keycode_text_conversion_unittest.cc +++ b/chrome/test/webdriver/keycode_text_conversion_unittest.cc @@ -10,7 +10,7 @@ #include "chrome/test/webdriver/keycode_text_conversion.h" #include "chrome/test/webdriver/webdriver_test_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" using automation::kShiftKeyMask; using webdriver::ConvertKeyCodeToText; diff --git a/chrome/test/webdriver/keycode_text_conversion_x.cc b/chrome/test/webdriver/keycode_text_conversion_x.cc index 8038bdc..b5cb42d 100644 --- a/chrome/test/webdriver/keycode_text_conversion_x.cc +++ b/chrome/test/webdriver/keycode_text_conversion_x.cc @@ -12,8 +12,8 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/common/automation_constants.h" -#include "ui/base/keycodes/keyboard_code_conversion_x.h" #include "ui/base/x/x11_util.h" +#include "ui/events/keycodes/keyboard_code_conversion_x.h" namespace webdriver { diff --git a/chrome/test/webdriver/webdriver_automation.h b/chrome/test/webdriver/webdriver_automation.h index 6848ae2..b5cb73d 100644 --- a/chrome/test/webdriver/webdriver_automation.h +++ b/chrome/test/webdriver/webdriver_automation.h @@ -15,7 +15,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/common/automation_constants.h" #include "chrome/test/webdriver/webdriver_logging.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" class AutomationId; class AutomationProxy; diff --git a/chrome/test/webdriver/webdriver_key_converter.h b/chrome/test/webdriver/webdriver_key_converter.h index 1743fdb..85fa7a2 100644 --- a/chrome/test/webdriver/webdriver_key_converter.h +++ b/chrome/test/webdriver/webdriver_key_converter.h @@ -10,7 +10,7 @@ #include "base/strings/string16.h" #include "chrome/test/webdriver/webdriver_automation.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" namespace webdriver { |