diff options
53 files changed, 140 insertions, 138 deletions
diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc index 79fa4e1..8e2c7ee 100644 --- a/chrome/browser/extensions/extension_input_api.cc +++ b/chrome/browser/extensions/extension_input_api.cc @@ -14,8 +14,8 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/common/chrome_notification_types.h" +#include "ui/views/ime/input_method.h" #include "views/events/event.h" -#include "views/ime/input_method.h" #include "views/views_delegate.h" #include "views/widget/widget.h" @@ -24,8 +24,8 @@ #endif #if defined(OS_CHROMEOS) && defined(TOUCH_UI) -#include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/input_method/ibus_controller.h" +#include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/login/base_login_display_host.h" #endif diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc index 3a4a9f5..b5ab500 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_views.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc @@ -31,8 +31,8 @@ #include "ui/base/text/text_elider.h" #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" +#include "ui/views/ime/input_method.h" #include "views/events/event.h" -#include "views/ime/input_method.h" #include "views/views_delegate.h" #include "views/widget/tooltip_manager.h" #include "views/widget/widget.h" @@ -46,9 +46,10 @@ #endif #if defined(TOOLKIT_USES_GTK) +#include <gdk/gdkx.h> #include <gtk/gtk.h> #include <gtk/gtkwindow.h> -#include <gdk/gdkx.h> + #include "content/browser/renderer_host/gtk_window_utils.h" #include "views/widget/native_widget_gtk.h" #endif diff --git a/chrome/browser/ui/views/first_run_bubble_unittest.cc b/chrome/browser/ui/views/first_run_bubble_unittest.cc index 867601a..ffdb766 100644 --- a/chrome/browser/ui/views/first_run_bubble_unittest.cc +++ b/chrome/browser/ui/views/first_run_bubble_unittest.cc @@ -8,7 +8,7 @@ #include "chrome/browser/ui/views/first_run_bubble.h" #include "chrome/test/base/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" -#include "views/test/views_test_base.h" +#include "ui/views/test/views_test_base.h" #include "views/view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc index 2a2f3fa..98c20a7 100644 --- a/chrome/browser/ui/views/menu_model_adapter_test.cc +++ b/chrome/browser/ui/views/menu_model_adapter_test.cc @@ -7,6 +7,7 @@ #include "chrome/browser/automation/ui_controls.h" #include "chrome/test/base/view_event_test_base.h" #include "ui/base/models/menu_model.h" +#include "ui/views/test/test_views_delegate.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_controller.h" #include "views/controls/menu/menu_item_view.h" @@ -14,7 +15,6 @@ #include "views/controls/menu/menu_runner.h" #include "views/controls/menu/submenu_view.h" #include "views/controls/menu/view_menu_delegate.h" -#include "views/test/test_views_delegate.h" #include "views/views_delegate.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc index 0d90627..b9c7c1e 100644 --- a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc +++ b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc @@ -28,7 +28,7 @@ #include "ui/gfx/compositor/layer.h" #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/screen.h" -#include "views/ime/text_input_type_tracker.h" +#include "ui/views/ime/text_input_type_tracker.h" #include "views/widget/widget.h" #if defined(OS_CHROMEOS) diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 531b1e7..8d669c9 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1987,10 +1987,10 @@ '../content/common/sandbox_mac_system_access_unittest.mm', '../testing/gtest_mac_unittest.mm', '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc', - '../views/test/test_views_delegate.cc', - '../views/test/test_views_delegate.h', - '../views/test/views_test_base.cc', - '../views/test/views_test_base.h', + '../ui/views/test/test_views_delegate.cc', + '../ui/views/test/test_views_delegate.h', + '../ui/views/test/views_test_base.cc', + '../ui/views/test/views_test_base.h', '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc', '../webkit/fileapi/file_system_operation_write_unittest.cc', '../webkit/fileapi/file_system_url_request_job_unittest.cc', @@ -2343,6 +2343,7 @@ 'sources/': [ ['exclude', '^browser/ui/views/'], ['exclude', '^../views/'], + ['exclude', '^../ui/views/'], ['exclude', '^browser/extensions/key_identifier_conversion_views_unittest.cc'], ], }], diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc index 84a0b14..6718d78 100644 --- a/ui/views/examples/examples_main.cc +++ b/ui/views/examples/examples_main.cc @@ -32,12 +32,12 @@ #include "ui/views/examples/textfield_example.h" #include "ui/views/examples/throbber_example.h" #include "ui/views/examples/widget_example.h" +#include "ui/views/test/test_views_delegate.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/focus/accelerator_handler.h" #include "views/layout/grid_layout.h" -#include "views/test/test_views_delegate.h" #include "views/widget/widget.h" #if defined(OS_WIN) diff --git a/ui/views/examples/native_widget_views_example.cc b/ui/views/examples/native_widget_views_example.cc index 0e00035..72cdab7 100644 --- a/ui/views/examples/native_widget_views_example.cc +++ b/ui/views/examples/native_widget_views_example.cc @@ -7,8 +7,8 @@ #include "base/utf_string_conversions.h" #include "ui/gfx/canvas.h" #include "ui/views/examples/example_base.h" +#include "ui/views/test/test_views_delegate.h" #include "views/controls/button/text_button.h" -#include "views/test/test_views_delegate.h" #include "views/view.h" #include "views/widget/native_widget_views.h" #include "views/widget/widget.h" diff --git a/views/ime/OWNERS b/ui/views/ime/OWNERS index d76ee7e..d76ee7e 100644 --- a/views/ime/OWNERS +++ b/ui/views/ime/OWNERS diff --git a/views/ime/input_method.h b/ui/views/ime/input_method.h index 4ec9523..178b6db 100644 --- a/views/ime/input_method.h +++ b/ui/views/ime/input_method.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 VIEWS_IME_INPUT_METHOD_H_ -#define VIEWS_IME_INPUT_METHOD_H_ +#ifndef UI_VIEWS_IME_INPUT_METHOD_H_ +#define UI_VIEWS_IME_INPUT_METHOD_H_ #pragma once #include <string> @@ -113,4 +113,4 @@ class VIEWS_EXPORT InputMethod { } // namespace views -#endif // VIEWS_IME_INPUT_METHOD_H_ +#endif // UI_VIEWS_IME_INPUT_METHOD_H_ diff --git a/views/ime/input_method_base.cc b/ui/views/ime/input_method_base.cc index 1fb0a15..4b53ff5 100644 --- a/views/ime/input_method_base.cc +++ b/ui/views/ime/input_method_base.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "ui/base/ime/text_input_client.h" -#include "views/ime/input_method_base.h" -#include "views/ime/text_input_type_tracker.h" +#include "ui/views/ime/input_method_base.h" +#include "ui/views/ime/text_input_type_tracker.h" #include "views/view.h" #include "views/widget/widget.h" diff --git a/views/ime/input_method_base.h b/ui/views/ime/input_method_base.h index 751757a..cdecbda 100644 --- a/views/ime/input_method_base.h +++ b/ui/views/ime/input_method_base.h @@ -2,23 +2,23 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_IME_INPUT_METHOD_BASE_H_ -#define VIEWS_IME_INPUT_METHOD_BASE_H_ +#ifndef UI_VIEWS_IME_INPUT_METHOD_BASE_H_ +#define UI_VIEWS_IME_INPUT_METHOD_BASE_H_ #pragma once #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "ui/views/ime/input_method.h" +#include "ui/views/ime/input_method_delegate.h" #include "views/focus/focus_manager.h" -#include "views/ime/input_method.h" -#include "views/ime/input_method_delegate.h" namespace gfx { class Rect; -} // namespace gfx +} namespace ui { class TextInputClient; -} // namespace ui +} namespace views { @@ -101,4 +101,4 @@ class VIEWS_EXPORT InputMethodBase : public InputMethod, } // namespace views -#endif // VIEWS_IME_INPUT_METHOD_BASE_H_ +#endif // UI_VIEWS_IME_INPUT_METHOD_BASE_H_ diff --git a/views/ime/input_method_delegate.h b/ui/views/ime/input_method_delegate.h index 32ce033..369cc8b 100644 --- a/views/ime/input_method_delegate.h +++ b/ui/views/ime/input_method_delegate.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 VIEWS_IME_INPUT_METHOD_DELEGATE_H_ -#define VIEWS_IME_INPUT_METHOD_DELEGATE_H_ +#ifndef UI_VIEWS_IME_INPUT_METHOD_DELEGATE_H_ +#define UI_VIEWS_IME_INPUT_METHOD_DELEGATE_H_ #pragma once #include "views/views_export.h" @@ -28,4 +28,4 @@ class VIEWS_EXPORT InputMethodDelegate { } // namespace internal } // namespace views -#endif // VIEWS_IME_INPUT_METHOD_DELEGATE_H_ +#endif // UI_VIEWS_IME_INPUT_METHOD_DELEGATE_H_ diff --git a/views/ime/input_method_gtk.cc b/ui/views/ime/input_method_gtk.cc index 50fd37e..edaa20e 100644 --- a/views/ime/input_method_gtk.cc +++ b/ui/views/ime/input_method_gtk.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 "views/ime/input_method_gtk.h" +#include "ui/views/ime/input_method_gtk.h" #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> @@ -17,8 +17,8 @@ #include "base/utf_string_conversions.h" #include "ui/base/gtk/event_synthesis_gtk.h" #include "ui/base/gtk/gtk_im_context_util.h" -#include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" +#include "ui/base/keycodes/keyboard_codes.h" #include "views/events/event.h" #include "views/widget/widget.h" diff --git a/views/ime/input_method_gtk.h b/ui/views/ime/input_method_gtk.h index 4e40409..670669f 100644 --- a/views/ime/input_method_gtk.h +++ b/ui/views/ime/input_method_gtk.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 VIEWS_IME_INPUT_METHOD_GTK_H_ -#define VIEWS_IME_INPUT_METHOD_GTK_H_ +#ifndef UI_VIEWS_IME_INPUT_METHOD_GTK_H_ +#define UI_VIEWS_IME_INPUT_METHOD_GTK_H_ #pragma once #include <gtk/gtk.h> @@ -13,7 +13,7 @@ #include "ui/base/gtk/gtk_signal.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/text_input_client.h" -#include "views/ime/input_method_base.h" +#include "ui/views/ime/input_method_base.h" #include "views/view.h" namespace views { @@ -120,4 +120,4 @@ class InputMethodGtk : public InputMethodBase { } // namespace views -#endif // VIEWS_IME_INPUT_METHOD_GTK_H_ +#endif // UI_VIEWS_IME_INPUT_METHOD_GTK_H_ diff --git a/views/ime/input_method_ibus.cc b/ui/views/ime/input_method_ibus.cc index 8291e6a..9fa9525 100644 --- a/views/ime/input_method_ibus.cc +++ b/ui/views/ime/input_method_ibus.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 "views/ime/input_method_ibus.h" +#include "ui/views/ime/input_method_ibus.h" #include <ibus.h> #if defined(TOUCH_UI) @@ -15,8 +15,8 @@ #include <set> #include <vector> -#include "base/command_line.h" #include "base/basictypes.h" +#include "base/command_line.h" #include "base/i18n/char_iterator.h" #include "base/logging.h" #include "base/string_util.h" diff --git a/views/ime/input_method_ibus.h b/ui/views/ime/input_method_ibus.h index 932e5a2..8d7b591 100644 --- a/views/ime/input_method_ibus.h +++ b/ui/views/ime/input_method_ibus.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 VIEWS_IME_INPUT_METHOD_IBUS_H_ -#define VIEWS_IME_INPUT_METHOD_IBUS_H_ +#ifndef UI_VIEWS_IME_INPUT_METHOD_IBUS_H_ +#define UI_VIEWS_IME_INPUT_METHOD_IBUS_H_ #pragma once #include <set> @@ -17,8 +17,8 @@ #include "ui/base/ime/character_composer.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/text_input_client.h" +#include "ui/views/ime/input_method_base.h" #include "views/events/event.h" -#include "views/ime/input_method_base.h" #include "views/view.h" // Forward declarations, so that we don't need to include ibus.h in this file. @@ -196,4 +196,4 @@ class InputMethodIBus : public InputMethodBase { } // namespace views -#endif // VIEWS_IME_INPUT_METHOD_IBUS_H_ +#endif // UI_VIEWS_IME_INPUT_METHOD_IBUS_H_ diff --git a/views/ime/input_method_wayland.cc b/ui/views/ime/input_method_wayland.cc index 4b90b2b..d35b1bd 100644 --- a/views/ime/input_method_wayland.cc +++ b/ui/views/ime/input_method_wayland.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 "views/ime/input_method_wayland.h" +#include "ui/views/ime/input_method_wayland.h" #include "views/widget/widget.h" diff --git a/views/ime/input_method_wayland.h b/ui/views/ime/input_method_wayland.h index 60dac30..7e937bf 100644 --- a/views/ime/input_method_wayland.h +++ b/ui/views/ime/input_method_wayland.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_IME_INPUT_METHOD_WAYLAND_H_ -#define VIEWS_IME_INPUT_METHOD_WAYLAND_H_ +#ifndef UI_VIEWS_IME_INPUT_METHOD_WAYLAND_H_ +#define UI_VIEWS_IME_INPUT_METHOD_WAYLAND_H_ #pragma once #include <string> -#include "views/ime/input_method_base.h" +#include "ui/views/ime/input_method_base.h" namespace views { @@ -33,4 +33,4 @@ class InputMethodWayland : public InputMethodBase { } // namespace views -#endif // VIEWS_IME_INPUT_METHOD_WAYLAND_H_ +#endif // UI_VIEWS_IME_INPUT_METHOD_WAYLAND_H_ diff --git a/views/ime/input_method_win.cc b/ui/views/ime/input_method_win.cc index 748df76..1bc56b1 100644 --- a/views/ime/input_method_win.cc +++ b/ui/views/ime/input_method_win.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 "views/ime/input_method_win.h" +#include "ui/views/ime/input_method_win.h" #include "base/basictypes.h" #include "base/logging.h" diff --git a/views/ime/input_method_win.h b/ui/views/ime/input_method_win.h index 912a4c6..6c4455f 100644 --- a/views/ime/input_method_win.h +++ b/ui/views/ime/input_method_win.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 VIEWS_IME_INPUT_METHOD_WIN_H_ -#define VIEWS_IME_INPUT_METHOD_WIN_H_ +#ifndef UI_VIEWS_IME_INPUT_METHOD_WIN_H_ +#define UI_VIEWS_IME_INPUT_METHOD_WIN_H_ #pragma once #include <windows.h> @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/base/win/ime_input.h" -#include "views/ime/input_method_base.h" +#include "ui/views/ime/input_method_base.h" #include "views/view.h" #include "views/widget/widget.h" @@ -102,4 +102,4 @@ class InputMethodWin : public InputMethodBase { } // namespace views -#endif // VIEWS_IME_INPUT_METHOD_WIN_H_ +#endif // UI_VIEWS_IME_INPUT_METHOD_WIN_H_ diff --git a/views/ime/mock_input_method.cc b/ui/views/ime/mock_input_method.cc index 5a227b7..52a5912 100644 --- a/views/ime/mock_input_method.cc +++ b/ui/views/ime/mock_input_method.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 "views/ime/mock_input_method.h" +#include "ui/views/ime/mock_input_method.h" #include "base/basictypes.h" #include "base/logging.h" diff --git a/views/ime/mock_input_method.h b/ui/views/ime/mock_input_method.h index b3392c1..5384661 100644 --- a/views/ime/mock_input_method.h +++ b/ui/views/ime/mock_input_method.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 VIEWS_IME_MOCK_INPUT_METHOD_H_ -#define VIEWS_IME_MOCK_INPUT_METHOD_H_ +#ifndef UI_VIEWS_IME_MOCK_INPUT_METHOD_H_ +#define UI_VIEWS_IME_MOCK_INPUT_METHOD_H_ #pragma once #include <string> @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/base/ime/composition_text.h" -#include "views/ime/input_method_base.h" +#include "ui/views/ime/input_method_base.h" #include "views/view.h" namespace views { @@ -85,4 +85,4 @@ class VIEWS_EXPORT MockInputMethod : public InputMethodBase { } // namespace views -#endif // VIEWS_IME_MOCK_INPUT_METHOD_H_ +#endif // UI_VIEWS_IME_MOCK_INPUT_METHOD_H_ diff --git a/views/ime/text_input_type_tracker.cc b/ui/views/ime/text_input_type_tracker.cc index 83412be..1e54909 100644 --- a/views/ime/text_input_type_tracker.cc +++ b/ui/views/ime/text_input_type_tracker.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 "views/ime/text_input_type_tracker.h" +#include "ui/views/ime/text_input_type_tracker.h" namespace views { diff --git a/views/ime/text_input_type_tracker.h b/ui/views/ime/text_input_type_tracker.h index a33ef20..04917ee 100644 --- a/views/ime/text_input_type_tracker.h +++ b/ui/views/ime/text_input_type_tracker.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 VIEWS_IME_TEXT_INPUT_TYPE_TRACKER_H_ -#define VIEWS_IME_TEXT_INPUT_TYPE_TRACKER_H_ +#ifndef UI_VIEWS_IME_TEXT_INPUT_TYPE_TRACKER_H_ +#define UI_VIEWS_IME_TEXT_INPUT_TYPE_TRACKER_H_ #pragma once #include "base/memory/singleton.h" @@ -57,4 +57,4 @@ class VIEWS_EXPORT TextInputTypeTracker { } // namespace views -#endif // VIEWS_IME_TEXT_INPUT_TYPE_TRACKER_H_ +#endif // UI_VIEWS_IME_TEXT_INPUT_TYPE_TRACKER_H_ diff --git a/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc index 3b1bd3b..086e987 100644 --- a/views/test/test_views_delegate.cc +++ b/ui/views/test/test_views_delegate.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 "views/test/test_views_delegate.h" +#include "ui/views/test/test_views_delegate.h" #include "base/logging.h" #include "ui/base/clipboard/clipboard.h" diff --git a/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h index 18e7da0..eece1f1 100644 --- a/views/test/test_views_delegate.h +++ b/ui/views/test/test_views_delegate.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 VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ -#define VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ +#ifndef UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ +#define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -69,4 +69,4 @@ class TestViewsDelegate : public ViewsDelegate { } // namespace views -#endif // VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ +#endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ diff --git a/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc index c4db9c0..b427004 100644 --- a/views/test/views_test_base.cc +++ b/ui/views/test/views_test_base.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 "views/test/views_test_base.h" +#include "ui/views/test/views_test_base.h" #if defined(OS_WIN) #include <ole2.h> diff --git a/views/test/views_test_base.h b/ui/views/test/views_test_base.h index 72181fa..51a9df6 100644 --- a/views/test/views_test_base.h +++ b/ui/views/test/views_test_base.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_TEST_VIEWS_TEST_BASE_H_ -#define VIEWS_TEST_VIEWS_TEST_BASE_H_ +#ifndef UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ +#define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ #pragma once #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "testing/gtest/include/gtest/gtest.h" -#include "views/test/test_views_delegate.h" +#include "ui/views/test/test_views_delegate.h" namespace views { @@ -46,4 +46,4 @@ class ViewsTestBase : public testing::Test { } // namespace views -#endif // VIEWS_TEST_VIEWS_TEST_BASE_H_ +#endif // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc index 55ff3d7..62fc00f 100644 --- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc +++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc @@ -6,11 +6,11 @@ #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/render_text.h" +#include "ui/views/test/views_test_base.h" #include "ui/views/touchui/touch_selection_controller.h" #include "ui/views/touchui/touch_selection_controller_impl.h" #include "views/controls/textfield/native_textfield_views.h" #include "views/controls/textfield/textfield.h" -#include "views/test/views_test_base.h" #include "views/widget/widget.h" namespace views { diff --git a/views/accessible_pane_view_unittest.cc b/views/accessible_pane_view_unittest.cc index 1c54ba5..b702b32 100644 --- a/views/accessible_pane_view_unittest.cc +++ b/views/accessible_pane_view_unittest.cc @@ -5,9 +5,9 @@ #include "views/accessible_pane_view.h" #include "ui/base/models/accelerator.h" +#include "ui/views/test/views_test_base.h" #include "views/controls/button/text_button.h" #include "views/layout/fill_layout.h" -#include "views/test/views_test_base.h" #include "views/widget/widget.h" namespace views { diff --git a/views/bubble/bubble_delegate_unittest.cc b/views/bubble/bubble_delegate_unittest.cc index f24c2c2..f6d256a 100644 --- a/views/bubble/bubble_delegate_unittest.cc +++ b/views/bubble/bubble_delegate_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ui/views/test/views_test_base.h" #include "views/bubble/bubble_delegate.h" #include "views/bubble/bubble_frame_view.h" -#include "views/test/views_test_base.h" #include "views/widget/widget.h" namespace views { diff --git a/views/bubble/bubble_frame_view_unittest.cc b/views/bubble/bubble_frame_view_unittest.cc index 500ae4f..6699bfd 100644 --- a/views/bubble/bubble_frame_view_unittest.cc +++ b/views/bubble/bubble_frame_view_unittest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "ui/base/hit_test.h" -#include "views/bubble/bubble_border.h" +#include "ui/views/test/views_test_base.h" #include "views/bubble/border_contents_view.h" +#include "views/bubble/bubble_border.h" #include "views/bubble/bubble_delegate.h" #include "views/bubble/bubble_frame_view.h" -#include "views/test/views_test_base.h" #include "views/widget/widget.h" namespace views { diff --git a/views/controls/combobox/native_combobox_views_unittest.cc b/views/controls/combobox/native_combobox_views_unittest.cc index 61689d9..76d0c3c 100644 --- a/views/controls/combobox/native_combobox_views_unittest.cc +++ b/views/controls/combobox/native_combobox_views_unittest.cc @@ -5,10 +5,10 @@ #include "base/utf_string_conversions.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/models/combobox_model.h" +#include "ui/views/ime/mock_input_method.h" +#include "ui/views/test/views_test_base.h" #include "views/controls/combobox/combobox.h" #include "views/controls/combobox/native_combobox_views.h" -#include "views/ime/mock_input_method.h" -#include "views/test/views_test_base.h" #include "views/widget/native_widget_private.h" #include "views/widget/widget.h" diff --git a/views/controls/menu/menu_model_adapter_unittest.cc b/views/controls/menu/menu_model_adapter_unittest.cc index af54852..76b2dd9 100644 --- a/views/controls/menu/menu_model_adapter_unittest.cc +++ b/views/controls/menu/menu_model_adapter_unittest.cc @@ -6,11 +6,11 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.h" #include "ui/base/models/menu_model_delegate.h" +#include "ui/views/test/views_test_base.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" #include "views/controls/menu/submenu_view.h" -#include "views/test/views_test_base.h" namespace { diff --git a/views/controls/scrollbar/scrollbar_unittest.cc b/views/controls/scrollbar/scrollbar_unittest.cc index 810b241..2704354 100644 --- a/views/controls/scrollbar/scrollbar_unittest.cc +++ b/views/controls/scrollbar/scrollbar_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/controls/scrollbar/scroll_bar.h" +#include "ui/views/test/views_test_base.h" #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/controls/scrollbar/native_scroll_bar_views.h" -#include "views/test/views_test_base.h" +#include "views/controls/scrollbar/scroll_bar.h" #include "views/widget/widget.h" namespace { diff --git a/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/views/controls/tabbed_pane/tabbed_pane_unittest.cc index 59e3bfc..75e8214 100644 --- a/views/controls/tabbed_pane/tabbed_pane_unittest.cc +++ b/views/controls/tabbed_pane/tabbed_pane_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/utf_string_conversions.h" #include "base/message_loop.h" +#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/views/test/views_test_base.h" #include "views/controls/tabbed_pane/tabbed_pane.h" -#include "views/test/views_test_base.h" #include "views/widget/widget.h" #include "views/widget/widget_delegate.h" diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc index 2d9535c..ccde435 100644 --- a/views/controls/textfield/native_textfield_views.cc +++ b/views/controls/textfield/native_textfield_views.cc @@ -18,6 +18,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/insets.h" #include "ui/gfx/render_text.h" +#include "ui/views/ime/input_method.h" #include "views/background.h" #include "views/border.h" #include "views/controls/focusable_border.h" @@ -28,7 +29,6 @@ #include "views/controls/textfield/textfield_controller.h" #include "views/controls/textfield/textfield_views_model.h" #include "views/events/event.h" -#include "views/ime/input_method.h" #include "views/metrics.h" #include "views/views_delegate.h" #include "views/widget/widget.h" diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc index 9979635..8fa815b 100644 --- a/views/controls/textfield/native_textfield_views_unittest.cc +++ b/views/controls/textfield/native_textfield_views_unittest.cc @@ -21,15 +21,15 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/render_text.h" +#include "ui/views/ime/mock_input_method.h" +#include "ui/views/test/test_views_delegate.h" +#include "ui/views/test/views_test_base.h" #include "views/controls/textfield/native_textfield_views.h" #include "views/controls/textfield/textfield.h" #include "views/controls/textfield/textfield_controller.h" #include "views/controls/textfield/textfield_views_model.h" #include "views/events/event.h" #include "views/focus/focus_manager.h" -#include "views/ime/mock_input_method.h" -#include "views/test/test_views_delegate.h" -#include "views/test/views_test_base.h" #include "views/views_delegate.h" #include "views/widget/native_widget_private.h" #include "views/widget/widget.h" diff --git a/views/controls/textfield/textfield_views_model_unittest.cc b/views/controls/textfield/textfield_views_model_unittest.cc index 5e02185..d56f47b 100644 --- a/views/controls/textfield/textfield_views_model_unittest.cc +++ b/views/controls/textfield/textfield_views_model_unittest.cc @@ -13,10 +13,10 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/range/range.h" #include "ui/gfx/render_text.h" +#include "ui/views/test/test_views_delegate.h" +#include "ui/views/test/views_test_base.h" #include "views/controls/textfield/textfield.h" #include "views/controls/textfield/textfield_views_model.h" -#include "views/test/test_views_delegate.h" -#include "views/test/views_test_base.h" #include "views/views_delegate.h" namespace { diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc index 6b452bd..1c4c9b3 100644 --- a/views/focus/accelerator_handler_touch.cc +++ b/views/focus/accelerator_handler_touch.cc @@ -9,9 +9,9 @@ #include <X11/extensions/XInput2.h> #include "ui/base/touch/touch_factory.h" +#include "ui/views/ime/input_method.h" #include "views/events/event.h" #include "views/focus/focus_manager.h" -#include "views/ime/input_method.h" #include "views/view.h" #include "views/widget/native_widget.h" diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc index 93b03a1..d4372f2 100644 --- a/views/focus/focus_manager_unittest.cc +++ b/views/focus/focus_manager_unittest.cc @@ -11,6 +11,7 @@ #include "ui/base/models/accelerator.h" #include "ui/base/models/combobox_model.h" #include "ui/gfx/rect.h" +#include "ui/views/test/views_test_base.h" #include "ui/views/window/non_client_view.h" #include "views/background.h" #include "views/border.h" @@ -27,7 +28,6 @@ #include "views/controls/textfield/textfield.h" #include "views/focus/accelerator_handler.h" #include "views/focus/focus_manager_factory.h" -#include "views/test/views_test_base.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" #include "views/widget/widget_delegate.h" diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 5161472..d0ed95f 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -21,6 +21,7 @@ #include "ui/gfx/compositor/test_texture.h" #include "ui/gfx/path.h" #include "ui/gfx/transform.h" +#include "ui/views/test/views_test_base.h" #include "ui/views/touchui/gesture_manager.h" #include "ui/views/window/dialog_delegate.h" #include "views/background.h" @@ -32,14 +33,13 @@ #include "views/events/event.h" #include "views/focus/accelerator_handler.h" #include "views/focus/view_storage.h" -#include "views/test/views_test_base.h" #include "views/view.h" #include "views/views_delegate.h" #include "views/widget/native_widget.h" #include "views/widget/root_view.h" #if defined(OS_WIN) -#include "views/test/test_views_delegate.h" +#include "ui/views/test/test_views_delegate.h" #endif #if defined(USE_AURA) #include "ui/aura/desktop.h" diff --git a/views/views.gyp b/views/views.gyp index d7a313a..6c63a8c 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -284,22 +284,6 @@ 'focus/view_storage.h', 'focus/widget_focus_manager.cc', 'focus/widget_focus_manager.h', - 'ime/input_method.h', - 'ime/input_method_delegate.h', - 'ime/input_method_base.cc', - 'ime/input_method_base.h', - 'ime/input_method_gtk.cc', - 'ime/input_method_gtk.h', - 'ime/input_method_ibus.cc', - 'ime/input_method_ibus.h', - 'ime/input_method_wayland.cc', - 'ime/input_method_wayland.h', - 'ime/input_method_win.cc', - 'ime/input_method_win.h', - 'ime/mock_input_method.cc', - 'ime/mock_input_method.h', - 'ime/text_input_type_tracker.h', - 'ime/text_input_type_tracker.cc', 'layout/box_layout.cc', 'layout/box_layout.h', 'layout/fill_layout.cc', @@ -390,6 +374,22 @@ '../ui/views/animation/bounds_animator.h', '../ui/views/accessibility/native_view_accessibility_win.cc', '../ui/views/accessibility/native_view_accessibility_win.h', + '../ui/views/ime/input_method_base.cc', + '../ui/views/ime/input_method_base.h', + '../ui/views/ime/input_method_delegate.h', + '../ui/views/ime/input_method_gtk.cc', + '../ui/views/ime/input_method_gtk.h', + '../ui/views/ime/input_method.h', + '../ui/views/ime/input_method_ibus.cc', + '../ui/views/ime/input_method_ibus.h', + '../ui/views/ime/input_method_wayland.cc', + '../ui/views/ime/input_method_wayland.h', + '../ui/views/ime/input_method_win.cc', + '../ui/views/ime/input_method_win.h', + '../ui/views/ime/mock_input_method.cc', + '../ui/views/ime/mock_input_method.h', + '../ui/views/ime/text_input_type_tracker.cc', + '../ui/views/ime/text_input_type_tracker.h', '../ui/views/touchui/gesture_manager.cc', '../ui/views/touchui/gesture_manager.h', '../ui/views/touchui/touch_selection_controller.cc', @@ -520,13 +520,13 @@ '../build/linux/system.gyp:ibus', ], 'sources/': [ - ['exclude', 'ime/mock_input_method.cc'], - ['exclude', 'ime/mock_input_method.h'], + ['exclude', '../ui/views/ime/mock_input_method.cc'], + ['exclude', '../ui/views/ime/mock_input_method.h'], ], }, { # else: use_ibus != 1 'sources/': [ - ['exclude', 'ime/input_method_ibus.cc'], - ['exclude', 'ime/input_method_ibus.h'], + ['exclude', '../ui/views/ime/input_method_ibus.cc'], + ['exclude', '../ui/views/ime/input_method_ibus.h'], ], }], ['OS=="win"', { @@ -576,6 +576,10 @@ 'sources': [ '../ui/views/animation/bounds_animator_unittest.cc', '../ui/views/touchui/touch_selection_controller_impl_unittest.cc', + '../ui/views/test/test_views_delegate.cc', + '../ui/views/test/test_views_delegate.h', + '../ui/views/test/views_test_base.cc', + '../ui/views/test/views_test_base.h', 'accessible_pane_view_unittest.cc', 'bubble/bubble_delegate_unittest.cc', 'bubble/bubble_frame_view_unittest.cc', @@ -594,11 +598,7 @@ 'focus/focus_manager_unittest.cc', 'layout/grid_layout_unittest.cc', 'layout/box_layout_unittest.cc', - 'test/views_test_base.cc', - 'test/views_test_base.h', 'run_all_unittests.cc', - 'test/test_views_delegate.cc', - 'test/test_views_delegate.h', 'view_unittest.cc', 'widget/native_widget_test_utils.h', 'widget/native_widget_test_utils_aura.cc', @@ -733,8 +733,8 @@ '../ui/views/examples/throbber_example.h', '../ui/views/examples/widget_example.cc', '../ui/views/examples/widget_example.h', - 'test/test_views_delegate.cc', - 'test/test_views_delegate.h', + '../ui/views/test/test_views_delegate.cc', + '../ui/views/test/test_views_delegate.h', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc', diff --git a/views/widget/native_widget_aura.cc b/views/widget/native_widget_aura.cc index fe0d3d1..18720cf 100644 --- a/views/widget/native_widget_aura.cc +++ b/views/widget/native_widget_aura.cc @@ -26,9 +26,9 @@ #endif #if defined(HAVE_IBUS) -#include "views/ime/input_method_ibus.h" +#include "ui/views/ime/input_method_ibus.h" #else -#include "views/ime/mock_input_method.h" +#include "ui/views/ime/mock_input_method.h" #endif namespace views { diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc index 240c2ad..0ab6886 100644 --- a/views/widget/native_widget_gtk.cc +++ b/views/widget/native_widget_gtk.cc @@ -4,11 +4,11 @@ #include "views/widget/native_widget_gtk.h" -#include <gdk/gdk.h> -#include <gdk/gdkx.h> -#include <X11/extensions/shape.h> #include <X11/Xatom.h> #include <X11/Xlib.h> +#include <X11/extensions/shape.h> +#include <gdk/gdk.h> +#include <gdk/gdkx.h> #include <set> #include <vector> @@ -22,8 +22,8 @@ #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h" #include "ui/base/gtk/g_object_destructor_filo.h" -#include "ui/base/gtk/gtk_windowing.h" #include "ui/base/gtk/gtk_signal_registrar.h" +#include "ui/base/gtk/gtk_windowing.h" #include "ui/base/gtk/scoped_handle_gtk.h" #include "ui/base/hit_test.h" #include "ui/base/x/x11_util.h" @@ -32,11 +32,11 @@ #include "ui/gfx/gtk_util.h" #include "ui/gfx/path.h" #include "ui/gfx/screen.h" +#include "ui/views/ime/input_method_gtk.h" +#include "views/bubble/bubble_delegate.h" #include "views/controls/textfield/native_textfield_views.h" #include "views/focus/view_storage.h" -#include "views/ime/input_method_gtk.h" #include "views/views_delegate.h" -#include "views/bubble/bubble_delegate.h" #include "views/widget/drop_target_gtk.h" #include "views/widget/gtk_views_fixed.h" #include "views/widget/gtk_views_window.h" @@ -52,7 +52,7 @@ #endif #if defined(HAVE_IBUS) -#include "views/ime/input_method_ibus.h" +#include "ui/views/ime/input_method_ibus.h" #endif using ui::OSExchangeData; diff --git a/views/widget/native_widget_private.h b/views/widget/native_widget_private.h index 40d8a59..df5bad3 100644 --- a/views/widget/native_widget_private.h +++ b/views/widget/native_widget_private.h @@ -8,7 +8,7 @@ #include "base/string16.h" #include "ui/gfx/native_widget_types.h" -#include "views/ime/input_method_delegate.h" +#include "ui/views/ime/input_method_delegate.h" #include "views/widget/native_widget.h" namespace gfx { diff --git a/views/widget/native_widget_unittest.cc b/views/widget/native_widget_unittest.cc index 9c7218d..7fc3818 100644 --- a/views/widget/native_widget_unittest.cc +++ b/views/widget/native_widget_unittest.cc @@ -3,12 +3,12 @@ // found in the LICENSE file. #include "testing/gtest/include/gtest/gtest.h" -#include "views/test/views_test_base.h" -#include "views/view.h" +#include "ui/views/test/views_test_base.h" #include "views/controls/native/native_view_host.h" +#include "views/view.h" #include "views/widget/native_widget_private.h" -#include "views/widget/widget.h" #include "views/widget/native_widget_test_utils.h" +#include "views/widget/widget.h" namespace views { diff --git a/views/widget/native_widget_views.cc b/views/widget/native_widget_views.cc index 7fd2933..6ebe1d7 100644 --- a/views/widget/native_widget_views.cc +++ b/views/widget/native_widget_views.cc @@ -17,9 +17,9 @@ #include "views/widget/window_manager.h" #if defined(HAVE_IBUS) -#include "views/ime/input_method_ibus.h" +#include "ui/views/ime/input_method_ibus.h" #else -#include "views/ime/mock_input_method.h" +#include "ui/views/ime/mock_input_method.h" #endif namespace { diff --git a/views/widget/native_widget_wayland.cc b/views/widget/native_widget_wayland.cc index cae95f7..989d08d 100644 --- a/views/widget/native_widget_wayland.cc +++ b/views/widget/native_widget_wayland.cc @@ -4,10 +4,10 @@ #include "views/widget/native_widget_wayland.h" -#include <cairo.h> -#include <cairo-gl.h> #include <EGL/egl.h> #include <GL/gl.h> +#include <cairo-gl.h> +#include <cairo.h> #include <wayland-egl.h> #include <algorithm> @@ -21,11 +21,11 @@ #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/gl/gl_surface.h" #include "ui/gfx/gl/gl_surface_egl.h" +#include "ui/views/ime/input_method_wayland.h" #include "ui/wayland/wayland_display.h" #include "ui/wayland/wayland_input_device.h" #include "ui/wayland/wayland_screen.h" #include "ui/wayland/wayland_window.h" -#include "views/ime/input_method_wayland.h" #include "views/views_delegate.h" #include "views/widget/native_widget_views.h" #include "views/widget/root_view.h" diff --git a/views/widget/native_widget_win.cc b/views/widget/native_widget_win.cc index e146bb3..b9bd491 100644 --- a/views/widget/native_widget_win.cc +++ b/views/widget/native_widget_win.cc @@ -33,12 +33,12 @@ #include "ui/gfx/path.h" #include "ui/gfx/screen.h" #include "ui/views/accessibility/native_view_accessibility_win.h" +#include "ui/views/ime/input_method_win.h" #include "ui/views/window/native_frame_view.h" #include "views/controls/native_control_win.h" #include "views/controls/textfield/native_textfield_views.h" #include "views/focus/accelerator_handler.h" #include "views/focus/view_storage.h" -#include "views/ime/input_method_win.h" #include "views/views_delegate.h" #include "views/widget/aero_tooltip_manager.h" #include "views/widget/child_window_message_processor.h" diff --git a/views/widget/widget.cc b/views/widget/widget.cc index acc7108..1ab394f 100644 --- a/views/widget/widget.cc +++ b/views/widget/widget.cc @@ -13,13 +13,13 @@ #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/screen.h" +#include "ui/views/ime/input_method.h" #include "ui/views/window/custom_frame_view.h" #include "views/controls/menu/menu_controller.h" #include "views/focus/focus_manager.h" #include "views/focus/focus_manager_factory.h" #include "views/focus/view_storage.h" #include "views/focus/widget_focus_manager.h" -#include "views/ime/input_method.h" #include "views/views_delegate.h" #include "views/widget/default_theme_provider.h" #include "views/widget/native_widget_private.h" diff --git a/views/widget/widget_unittest.cc b/views/widget/widget_unittest.cc index 8af4526..fc6c22a 100644 --- a/views/widget/widget_unittest.cc +++ b/views/widget/widget_unittest.cc @@ -8,8 +8,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "testing/gtest/include/gtest/gtest.h" -#include "views/test/test_views_delegate.h" -#include "views/test/views_test_base.h" +#include "ui/views/test/test_views_delegate.h" +#include "ui/views/test/views_test_base.h" #include "views/views_delegate.h" #if defined(USE_AURA) |