diff options
Diffstat (limited to 'ui/base')
30 files changed, 49 insertions, 49 deletions
diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h index 5e1a488..3b92729 100644 --- a/ui/base/accelerators/accelerator.h +++ b/ui/base/accelerators/accelerator.h @@ -12,8 +12,8 @@ #define UI_BASE_ACCELERATORS_ACCELERATOR_H_ #include "base/string16.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/events.h" #include "ui/base/ui_export.h" namespace ui { diff --git a/ui/base/accelerators/accelerator_manager.h b/ui/base/accelerators/accelerator_manager.h index 3310db7..70f4a71 100644 --- a/ui/base/accelerators/accelerator_manager.h +++ b/ui/base/accelerators/accelerator_manager.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" namespace ui { diff --git a/ui/base/accelerators/accelerator_manager_unittest.cc b/ui/base/accelerators/accelerator_manager_unittest.cc index fddd914..69bfc46 100644 --- a/ui/base/accelerators/accelerator_manager_unittest.cc +++ b/ui/base/accelerators/accelerator_manager_unittest.cc @@ -6,7 +6,7 @@ #include "base/compiler_specific.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/keycodes/keyboard_codes.h" namespace ui { diff --git a/ui/base/cocoa/events_mac.mm b/ui/base/cocoa/events_mac.mm index 4471882..7d880a4 100644 --- a/ui/base/cocoa/events_mac.mm +++ b/ui/base/cocoa/events_mac.mm @@ -4,7 +4,7 @@ #include <Cocoa/Cocoa.h> -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "base/logging.h" #include "base/time.h" diff --git a/ui/base/cocoa/events_mac_unittest.mm b/ui/base/cocoa/events_mac_unittest.mm index eb4e159..b9bb4ff 100644 --- a/ui/base/cocoa/events_mac_unittest.mm +++ b/ui/base/cocoa/events_mac_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/test/cocoa_test_event_utils.h" #import "ui/base/test/ui_cocoa_test_helper.h" #include "ui/gfx/point.h" diff --git a/ui/base/event.cc b/ui/base/event.cc index bb4af75..69d1325 100644 --- a/ui/base/event.cc +++ b/ui/base/event.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/base/event.h" +#include "ui/base/events/event.h" #if defined(USE_X11) #include <X11/Xlib.h> @@ -11,8 +11,8 @@ #include <cstring> #include "ui/base/keycodes/keyboard_code_conversion.h" -#include "ui/gfx/point3.h" #include "ui/gfx/interpolated_transform.h" +#include "ui/gfx/point3.h" #include "ui/gfx/transform.h" #if defined(USE_X11) diff --git a/ui/base/event_unittest.cc b/ui/base/event_unittest.cc index fde2b76..4bdd830 100644 --- a/ui/base/event_unittest.cc +++ b/ui/base/event_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/base/event.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/events/event.h" #if defined(USE_X11) #include <X11/Xlib.h> diff --git a/ui/base/event.h b/ui/base/events/event.h index d572f15..1b66582 100644 --- a/ui/base/event.h +++ b/ui/base/events/event.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_BASE_EVENT_H_ -#define UI_BASE_EVENT_H_ +#ifndef UI_BASE_EVENTS_EVENT_CONSTANTS_EVENT_H_ +#define UI_BASE_EVENTS_EVENT_CONSTANTS_EVENT_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/time.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/ui_export.h" @@ -601,4 +601,4 @@ class UI_EXPORT GestureEvent : public LocatedEvent { } // namespace ui -#endif // UI_BASE_EVENT_H_ +#endif // UI_BASE_EVENTS_EVENT_CONSTANTS_EVENT_H_ diff --git a/ui/base/events.h b/ui/base/events/event_constants.h index 891fc32..e213bf8 100644 --- a/ui/base/events.h +++ b/ui/base/events/event_constants.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_BASE_EVENTS_H_ -#define UI_BASE_EVENTS_H_ +#ifndef UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_H_ +#define UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_H_ #include "base/event_types.h" #include "ui/base/keycodes/keyboard_codes.h" @@ -228,4 +228,4 @@ UI_EXPORT bool IsMouseEventFromTouch(UINT message); } // namespace ui -#endif // UI_BASE_EVENTS_H_ +#endif // UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_H_ diff --git a/ui/base/events/event_dispatcher.h b/ui/base/events/event_dispatcher.h index d449365..67b5a4e 100644 --- a/ui/base/events/event_dispatcher.h +++ b/ui/base/events/event_dispatcher.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_BASE_EVENTS_EVENT_DISPATCHER_H_ -#define UI_BASE_EVENTS_EVENT_DISPATCHER_H_ +#ifndef UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_DISPATCHER_H_ +#define UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_DISPATCHER_H_ -#include "ui/base/event.h" -#include "ui/base/events.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" #include "ui/base/events/event_target.h" #include "ui/base/ui_export.h" @@ -115,4 +115,4 @@ class UI_EXPORT EventDispatcher { } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_DISPATCHER_H_ +#endif // UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_DISPATCHER_H_ diff --git a/ui/base/events/event_handler.h b/ui/base/events/event_handler.h index 7411536..e331bdc 100644 --- a/ui/base/events/event_handler.h +++ b/ui/base/events/event_handler.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_BASE_EVENTS_EVENT_HANDLER_H_ -#define UI_BASE_EVENTS_EVENT_HANDLER_H_ +#ifndef UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_HANDLER_H_ +#define UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_HANDLER_H_ #include <vector> -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" namespace ui { @@ -46,4 +46,4 @@ typedef std::vector<EventHandler*> EventHandlerList; } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_HANDLER_H_ +#endif // UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_HANDLER_H_ diff --git a/ui/base/events/event_target.h b/ui/base/events/event_target.h index 86bb98f..daf7694 100644 --- a/ui/base/events/event_target.h +++ b/ui/base/events/event_target.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_BASE_EVENTS_EVENT_TARGET_H_ -#define UI_BASE_EVENTS_EVENT_TARGET_H_ +#ifndef UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_TARGET_H_ +#define UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_TARGET_H_ #include "base/compiler_specific.h" #include "ui/base/events/event_handler.h" @@ -77,4 +77,4 @@ class UI_EXPORT EventTarget : public EventHandler { } // namespace ui -#endif // UI_BASE_EVENTS_EVENT_TARGET_H_ +#endif // UI_BASE_EVENTS_EVENT_CONSTANTS_EVENTS_EVENT_TARGET_H_ diff --git a/ui/base/gestures/gesture_point.cc b/ui/base/gestures/gesture_point.cc index 89ec955..1447a43 100644 --- a/ui/base/gestures/gesture_point.cc +++ b/ui/base/gestures/gesture_point.cc @@ -7,11 +7,11 @@ #include <cmath> #include "base/basictypes.h" -#include "ui/base/event.h" -#include "ui/base/events.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_configuration.h" -#include "ui/base/gestures/gesture_util.h" #include "ui/base/gestures/gesture_types.h" +#include "ui/base/gestures/gesture_util.h" namespace ui { diff --git a/ui/base/gestures/gesture_recognizer.h b/ui/base/gestures/gesture_recognizer.h index d8a7663..af3af54 100644 --- a/ui/base/gestures/gesture_recognizer.h +++ b/ui/base/gestures/gesture_recognizer.h @@ -8,7 +8,7 @@ #include <vector> #include "base/memory/scoped_vector.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/ui_export.h" diff --git a/ui/base/gestures/gesture_recognizer_impl.cc b/ui/base/gestures/gesture_recognizer_impl.cc index 718f044..bb3038c 100644 --- a/ui/base/gestures/gesture_recognizer_impl.cc +++ b/ui/base/gestures/gesture_recognizer_impl.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "ui/base/event.h" -#include "ui/base/events.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/gestures/gesture_sequence.h" #include "ui/base/gestures/gesture_types.h" diff --git a/ui/base/gestures/gesture_recognizer_impl.h b/ui/base/gestures/gesture_recognizer_impl.h index b591531..0af2a6c 100644 --- a/ui/base/gestures/gesture_recognizer_impl.h +++ b/ui/base/gestures/gesture_recognizer_impl.h @@ -11,7 +11,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/ui_export.h" #include "ui/gfx/point.h" diff --git a/ui/base/gestures/gesture_sequence.cc b/ui/base/gestures/gesture_sequence.cc index 80d595e..d668a1e 100644 --- a/ui/base/gestures/gesture_sequence.cc +++ b/ui/base/gestures/gesture_sequence.cc @@ -9,8 +9,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" -#include "ui/base/event.h" -#include "ui/base/events.h" +#include "ui/base/events/event.h" +#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_configuration.h" #include "ui/base/gestures/gesture_util.h" #include "ui/gfx/rect.h" diff --git a/ui/base/gestures/gesture_sequence.h b/ui/base/gestures/gesture_sequence.h index 9827eb3..e6988e5 100644 --- a/ui/base/gestures/gesture_sequence.h +++ b/ui/base/gestures/gesture_sequence.h @@ -6,7 +6,7 @@ #define UI_BASE_GESTURES_GESTURE_SEQUENCE_H_ #include "base/timer.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/gestures/gesture_point.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/gfx/rect.h" diff --git a/ui/base/gestures/gesture_types.h b/ui/base/gestures/gesture_types.h index 14b73cd..d44de87 100644 --- a/ui/base/gestures/gesture_types.h +++ b/ui/base/gestures/gesture_types.h @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/time.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/gfx/rect.h" namespace ui { diff --git a/ui/base/ime/character_composer.cc b/ui/base/ime/character_composer.cc index 3bcda38..7268445 100644 --- a/ui/base/ime/character_composer.cc +++ b/ui/base/ime/character_composer.cc @@ -12,7 +12,7 @@ // Note for Gtk removal: gdkkeysyms.h only contains a set of // '#define GDK_KeyName 0xNNNN' macros and does not #include any Gtk headers. #include "third_party/gtk+/gdk/gdkkeysyms.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/glib/glib_integers.h" namespace { diff --git a/ui/base/ime/character_composer_unittest.cc b/ui/base/ime/character_composer_unittest.cc index 0e304c6..8f93da2 100644 --- a/ui/base/ime/character_composer_unittest.cc +++ b/ui/base/ime/character_composer_unittest.cc @@ -7,7 +7,7 @@ #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/gtk+/gdk/gdkkeysyms.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/glib/glib_integers.h" namespace ui { diff --git a/ui/base/ime/input_method_base.h b/ui/base/ime/input_method_base.h index 61511d0..f23b37c 100644 --- a/ui/base/ime/input_method_base.h +++ b/ui/base/ime/input_method_base.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ime/input_method.h" #include "ui/base/ui_export.h" diff --git a/ui/base/ime/input_method_delegate.h b/ui/base/ime/input_method_delegate.h index c398e27..3202d90 100644 --- a/ui/base/ime/input_method_delegate.h +++ b/ui/base/ime/input_method_delegate.h @@ -6,7 +6,7 @@ #define UI_BASE_IME_INPUT_METHOD_DELEGATE_H_ #include "base/event_types.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" namespace ui { diff --git a/ui/base/ime/input_method_ibus.cc b/ui/base/ime/input_method_ibus.cc index d3d81a4..3a06d132 100644 --- a/ui/base/ime/input_method_ibus.cc +++ b/ui/base/ime/input_method_ibus.cc @@ -26,7 +26,7 @@ #include "chromeos/dbus/ibus/ibus_client.h" #include "chromeos/dbus/ibus/ibus_input_context_client.h" #include "chromeos/dbus/ibus/ibus_text.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ime/ibus_client.h" #include "ui/base/ime/text_input_client.h" #include "ui/base/keycodes/keyboard_code_conversion.h" diff --git a/ui/base/ime/mock_input_method.cc b/ui/base/ime/mock_input_method.cc index 9f6e032..2c22606 100644 --- a/ui/base/ime/mock_input_method.cc +++ b/ui/base/ime/mock_input_method.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/string16.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/glib/glib_integers.h" #include "ui/base/ime/input_method_delegate.h" #include "ui/base/ime/text_input_client.h" diff --git a/ui/base/keycodes/keyboard_code_conversion.cc b/ui/base/keycodes/keyboard_code_conversion.cc index 26ddd87..1a4d92a 100644 --- a/ui/base/keycodes/keyboard_code_conversion.cc +++ b/ui/base/keycodes/keyboard_code_conversion.cc @@ -4,7 +4,7 @@ #include "ui/base/keycodes/keyboard_code_conversion.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" namespace ui { diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc index 3b2569c..80b4eaf 100644 --- a/ui/base/win/events_win.cc +++ b/ui/base/win/events_win.cc @@ -4,7 +4,7 @@ #include <windowsx.h> -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "base/logging.h" #include "base/time.h" diff --git a/ui/base/x/events_x.cc b/ui/base/x/events_x.cc index 8c2dff2..960dda4 100644 --- a/ui/base/x/events_x.cc +++ b/ui/base/x/events_x.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include <string.h> #include <X11/extensions/XInput.h> diff --git a/ui/base/x/events_x_unittest.cc b/ui/base/x/events_x_unittest.cc index 18010a3..422e669 100644 --- a/ui/base/x/events_x_unittest.cc +++ b/ui/base/x/events_x_unittest.cc @@ -11,7 +11,7 @@ #undef None #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/gfx/point.h" namespace ui { diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h index c8b4e25..d60b4d2 100644 --- a/ui/base/x/x11_util.h +++ b/ui/base/x/x11_util.h @@ -15,7 +15,7 @@ #include <vector> #include "base/basictypes.h" -#include "ui/base/events.h" +#include "ui/base/events/event_constants.h" #include "ui/base/ui_export.h" #include "ui/gfx/point.h" |