diff options
55 files changed, 85 insertions, 85 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 6121d1b..e9627b7 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -69,9 +69,9 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" +#include "ui/base/accelerators/accelerator_cocoa.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" -#include "ui/base/models/accelerator_cocoa.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/login/screen_locker.h b/chrome/browser/chromeos/login/screen_locker.h index 3498ab6..4ce02df 100644 --- a/chrome/browser/chromeos/login/screen_locker.h +++ b/chrome/browser/chromeos/login/screen_locker.h @@ -13,7 +13,7 @@ #include "base/time.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" #include "chrome/browser/chromeos/login/screen_locker_delegate.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc index b687269..2757e19 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc +++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc @@ -17,8 +17,8 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/models/accelerator.h" #include "views/view.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.h b/chrome/browser/chromeos/login/wizard_accessibility_helper.h index bd93eac..cac8eda 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_helper.h +++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.h @@ -10,8 +10,8 @@ #include "base/memory/singleton.h" #include "chrome/browser/chromeos/login/wizard_accessibility_handler.h" #include "content/public/browser/notification_registrar.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/models/accelerator.h" class Profile; namespace views { diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index fde6176..693712d 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -41,8 +41,8 @@ #include "chrome/browser/ui/options/options_util.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_types.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/models/accelerator.h" #if defined(USE_LINUX_BREAKPAD) #include "chrome/app/breakpad_linux.h" diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index a266c59..1d6b8a3 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -20,8 +20,8 @@ #include "grit/generated_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/models/accelerator.h" #include "unicode/locid.h" namespace chromeos { diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h index 4f97743..cdfa0da 100644 --- a/chrome/browser/external_tab_container_win.h +++ b/chrome/browser/external_tab_container_win.h @@ -25,7 +25,7 @@ #include "content/public/browser/navigation_types.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/views/widget/native_widget_win.h" class AutomationProvider; diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.h b/chrome/browser/ui/cocoa/accelerators_cocoa.h index 867dda5..5f3f060 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.h +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.h @@ -8,7 +8,7 @@ #include <map> -#include "ui/base/models/accelerator_cocoa.h" +#include "ui/base/accelerators/accelerator_cocoa.h" template <typename T> struct DefaultSingletonTraits; diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm b/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm index c6e2346..836fece 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa_unittest.mm @@ -9,7 +9,7 @@ #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h" -#include "ui/base/models/accelerator_cocoa.h" +#include "ui/base/accelerators/accelerator_cocoa.h" TEST(AcceleratorsCocoaTest, GetAccelerator) { AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance(); diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.h b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.h index 8a1816d..89c897d 100644 --- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.h +++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.h @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> #import "base/mac/cocoa_protocols.h" -#include "ui/base/models/accelerator_cocoa.h" +#include "ui/base/accelerators/accelerator_cocoa.h" @class ConfirmQuitFrameView; diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm b/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm index 36aed30..779af12 100644 --- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller_unittest.mm @@ -6,7 +6,7 @@ #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h" #include "testing/gtest_mac.h" -#include "ui/base/models/accelerator_cocoa.h" +#include "ui/base/accelerators/accelerator_cocoa.h" namespace { diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm index e495eff..5929338 100644 --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm @@ -10,7 +10,6 @@ #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #include "chrome/browser/ui/cocoa/event_utils.h" #import "chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h" @@ -18,12 +17,13 @@ #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "grit/generated_resources.h" #include "grit/ui_strings.h" -#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" -#include "ui/base/models/accelerator_cocoa.h" +#include "ui/base/accelerators/accelerator_cocoa.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm index 054f079..5047e5f 100644 --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm @@ -5,16 +5,16 @@ #import "chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h" #include "base/mac/mac_util.h" +#include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/cocoa/browser_window_controller.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" -#include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/site_instance.h" #include "testing/gtest_mac.h" -#include "ui/base/models/accelerator_cocoa.h" +#include "ui/base/accelerators/accelerator_cocoa.h" @interface FullscreenExitBubbleController(JustForTesting) // Already defined. diff --git a/chrome/browser/ui/cocoa/menu_controller.mm b/chrome/browser/ui/cocoa/menu_controller.mm index ccce40e..7af0a5b 100644 --- a/chrome/browser/ui/cocoa/menu_controller.mm +++ b/chrome/browser/ui/cocoa/menu_controller.mm @@ -8,8 +8,8 @@ #include "base/sys_string_conversions.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/accelerators/accelerator_cocoa.h" #include "ui/base/l10n/l10n_util_mac.h" -#include "ui/base/models/accelerator_cocoa.h" #include "ui/base/models/simple_menu_model.h" @interface MenuController (Private) diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm index bd4b9c1..7ff900f 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm @@ -10,6 +10,7 @@ #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/app_controller_mac.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" @@ -18,7 +19,6 @@ #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h" #include "chrome/browser/ui/toolbar/wrench_menu_model.h" -#include "chrome/browser/profiles/profile.h" #include "content/browser/user_metrics.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_service.h" @@ -26,8 +26,8 @@ #include "content/public/browser/notification_types.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/accelerators/accelerator_cocoa.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/models/accelerator_cocoa.h" #include "ui/base/models/menu_model.h" @interface WrenchMenuController (Private) diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index 227257a..019a565 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -24,8 +24,8 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "net/test/test_server.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/models/accelerator.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/find_bar_host.h" diff --git a/chrome/browser/ui/gtk/accelerators_gtk.h b/chrome/browser/ui/gtk/accelerators_gtk.h index 4c776d7..58d4e7d 100644 --- a/chrome/browser/ui/gtk/accelerators_gtk.h +++ b/chrome/browser/ui/gtk/accelerators_gtk.h @@ -7,7 +7,7 @@ #pragma once #include "base/hash_tables.h" -#include "ui/base/models/accelerator_gtk.h" +#include "ui/base/accelerators/accelerator_gtk.h" template <typename T> struct DefaultSingletonTraits; diff --git a/chrome/browser/ui/gtk/accelerators_gtk_unittest.cc b/chrome/browser/ui/gtk/accelerators_gtk_unittest.cc index b3fbb21..4ef4a2f 100644 --- a/chrome/browser/ui/gtk/accelerators_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/accelerators_gtk_unittest.cc @@ -8,7 +8,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/gtk/accelerators_gtk.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/models/accelerator_gtk.h" +#include "ui/base/accelerators/accelerator_gtk.h" TEST(AcceleratorsGtkTest, GetAccelerator) { AcceleratorsGtk* keymap = AcceleratorsGtk::GetInstance(); diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc index 17df62c..341e757 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc @@ -44,15 +44,15 @@ #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/user_metrics.h" -#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "ui/base/accelerators/accelerator_gtk.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/models/accelerator_gtk.h" #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/gtk_util.h" #include "ui/gfx/skbitmap_operations.h" diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.h b/chrome/browser/ui/gtk/browser_toolbar_gtk.h index 4e74e56..b5dba1d 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.h +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.h @@ -18,10 +18,10 @@ #include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/gtk_signal_registrar.h" #include "ui/base/gtk/owned_widget_gtk.h" -#include "ui/base/models/accelerator.h" #include "ui/base/models/simple_menu_model.h" class BackForwardButtonGtk; diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc index d006168..24a4643 100644 --- a/chrome/browser/ui/gtk/menu_gtk.cc +++ b/chrome/browser/ui/gtk/menu_gtk.cc @@ -18,7 +18,7 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/views/event_utils.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/base/models/accelerator_gtk.h" +#include "ui/base/accelerators/accelerator_gtk.h" #include "ui/base/models/button_menu_item_model.h" #include "ui/base/models/menu_model.h" #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_gtk.cc index b80abd9..d6bf3c4 100644 --- a/chrome/browser/ui/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_gtk.cc @@ -18,9 +18,9 @@ #include "chrome/browser/ui/tabs/tab_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/accelerators/accelerator_gtk.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/gtk/scoped_handle_gtk.h" -#include "ui/base/models/accelerator_gtk.h" #include "ui/gfx/path.h" namespace { diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.h b/chrome/browser/ui/toolbar/wrench_menu_model.h index 5d9aa8f..681e5a9 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.h +++ b/chrome/browser/ui/toolbar/wrench_menu_model.h @@ -12,7 +12,7 @@ #include "chrome/browser/ui/toolbar/bookmark_sub_menu_model.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/models/button_menu_item_model.h" #include "ui/base/models/simple_menu_model.h" diff --git a/chrome/browser/ui/views/bubble/bubble.h b/chrome/browser/ui/views/bubble/bubble.h index cf2444e..62ee096 100644 --- a/chrome/browser/ui/views/bubble/bubble.h +++ b/chrome/browser/ui/views/bubble/bubble.h @@ -8,8 +8,8 @@ #include "base/compiler_specific.h" #include "base/observer_list.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/animation/animation_delegate.h" -#include "ui/base/models/accelerator.h" #include "ui/views/bubble/bubble_border.h" #include "views/view.h" diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc index 9a08011..6f7e580 100644 --- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc +++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/constrained_window_views.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc index d943d0a..a5fd4c6 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc @@ -16,8 +16,8 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/models/accelerator.h" #include "ui/base/resource/resource_bundle.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 67ffe39..6d82700 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -89,10 +89,10 @@ #include "grit/theme_resources_standard.h" #include "grit/ui_resources.h" #include "grit/webkit_resources.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/models/accelerator.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/views/events/event.h" diff --git a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc index 125e1c4..326f5b2 100644 --- a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc +++ b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc @@ -12,8 +12,8 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "grit/generated_resources.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/models/accelerator.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index e38ed6a..aeed846 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -21,8 +21,8 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/models/accelerator.h" #include "ui/base/models/table_model_observer.h" #include "ui/views/controls/table/group_table_view.h" #include "ui/views/controls/table/table_view_observer.h" diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h index ce79819..a4ae727 100644 --- a/chrome/browser/ui/views/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar_view.h @@ -16,8 +16,8 @@ #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/views/reload_button.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/animation/slide_animation.h" -#include "ui/base/models/accelerator.h" #include "views/accessible_pane_view.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/view_menu_delegate.h" diff --git a/chrome/test/base/menu_model_test.h b/chrome/test/base/menu_model_test.h index 562515f..6276f1c 100644 --- a/chrome/test/base/menu_model_test.h +++ b/chrome/test/base/menu_model_test.h @@ -6,15 +6,15 @@ #define CHROME_TEST_BASE_MENU_MODEL_TEST_H_ #pragma once -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/models/simple_menu_model.h" // A mix-in class to be used in addition to something that derrives from // testing::Test to provide some extra functionality for testing menu models. class MenuModelTest { public: - MenuModelTest() { } - virtual ~MenuModelTest() { } + MenuModelTest() {} + virtual ~MenuModelTest() {} protected: // A menu delegate that counts the number of times certain things are called @@ -22,7 +22,7 @@ class MenuModelTest { class Delegate : public ui::SimpleMenuModel::Delegate, public ui::AcceleratorProvider { public: - Delegate() : execute_count_(0), enable_count_(0) { } + Delegate() : execute_count_(0), enable_count_(0) {} virtual bool IsCommandIdChecked(int command_id) const OVERRIDE { return false; diff --git a/ui/aura_shell/shell_accelerator_controller.cc b/ui/aura_shell/shell_accelerator_controller.cc index 9c67a9d..99f12a4 100644 --- a/ui/aura_shell/shell_accelerator_controller.cc +++ b/ui/aura_shell/shell_accelerator_controller.cc @@ -7,8 +7,8 @@ #include "ui/aura/desktop.h" #include "ui/aura/event.h" #include "ui/aura_shell/shell.h" -#include "ui/base/accelerator_manager.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" +#include "ui/base/accelerators/accelerator_manager.h" #include "ui/gfx/compositor/layer_animation_sequence.h" #include "ui/gfx/compositor/layer_animator.h" #include "ui/gfx/compositor/screen_rotation.h" diff --git a/ui/aura_shell/shell_accelerator_controller.h b/ui/aura_shell/shell_accelerator_controller.h index 14f1f3a..86fe41b 100644 --- a/ui/aura_shell/shell_accelerator_controller.h +++ b/ui/aura_shell/shell_accelerator_controller.h @@ -10,11 +10,11 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "ui/aura_shell/aura_shell_export.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" namespace ui { class AcceleratorManager; -} // namespace ui +} namespace aura_shell { diff --git a/ui/aura_shell/shell_accelerator_filter.cc b/ui/aura_shell/shell_accelerator_filter.cc index 3a9cde5..aeacf8e 100644 --- a/ui/aura_shell/shell_accelerator_filter.cc +++ b/ui/aura_shell/shell_accelerator_filter.cc @@ -8,8 +8,8 @@ #include "ui/aura/event.h" #include "ui/aura_shell/shell.h" #include "ui/aura_shell/shell_accelerator_controller.h" -#include "ui/base/accelerator_manager.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" +#include "ui/base/accelerators/accelerator_manager.h" namespace { const int kModifierFlagMask = (ui::EF_SHIFT_DOWN | diff --git a/ui/base/models/accelerator.cc b/ui/base/accelerators/accelerator.cc index 45dee03..74d9f03 100644 --- a/ui/base/models/accelerator.cc +++ b/ui/base/accelerators/accelerator.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/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #if defined(OS_WIN) #include <windows.h> diff --git a/ui/base/models/accelerator.h b/ui/base/accelerators/accelerator.h index 42de42a..5977c8c2 100644 --- a/ui/base/models/accelerator.h +++ b/ui/base/accelerators/accelerator.h @@ -8,8 +8,8 @@ // It also defines the < operator so that it can be used as a key in a std::map. // -#ifndef UI_BASE_MODELS_ACCELERATOR_H_ -#define UI_BASE_MODELS_ACCELERATOR_H_ +#ifndef UI_BASE_ACCELERATORS_ACCELERATOR_H_ +#define UI_BASE_ACCELERATORS_ACCELERATOR_H_ #pragma once #include "base/string16.h" @@ -126,4 +126,4 @@ class AcceleratorProvider { } // namespace ui -#endif // UI_BASE_MODELS_ACCELERATOR_H_ +#endif // UI_BASE_ACCELERATORS_ACCELERATOR_H_ diff --git a/ui/base/models/accelerator_cocoa.h b/ui/base/accelerators/accelerator_cocoa.h index f1c980c..5be4715 100644 --- a/ui/base/models/accelerator_cocoa.h +++ b/ui/base/accelerators/accelerator_cocoa.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 UI_BASE_MODELS_ACCELERATOR_COCOA_H_ -#define UI_BASE_MODELS_ACCELERATOR_COCOA_H_ +#ifndef UI_BASE_ACCELERATORS_ACCELERATOR_COCOA_H_ +#define UI_BASE_ACCELERATORS_ACCELERATOR_COCOA_H_ #pragma once #include <Foundation/Foundation.h> #include "base/memory/scoped_nsobject.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/ui_export.h" namespace ui { @@ -41,4 +41,4 @@ class UI_EXPORT AcceleratorCocoa : public Accelerator { } // namespace ui -#endif // UI_BASE_MODELS_ACCELERATOR_COCOA_H_ +#endif // UI_BASE_ACCELERATORS_ACCELERATOR_COCOA_H_ diff --git a/ui/base/models/accelerator_cocoa.mm b/ui/base/accelerators/accelerator_cocoa.mm index 414a14e..f88290c 100644 --- a/ui/base/models/accelerator_cocoa.mm +++ b/ui/base/accelerators/accelerator_cocoa.mm @@ -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/models/accelerator_cocoa.h" +#include "ui/base/accelerators/accelerator_cocoa.h" namespace ui { diff --git a/ui/base/models/accelerator_gtk.h b/ui/base/accelerators/accelerator_gtk.h index 720e291..4b4f1b3 100644 --- a/ui/base/models/accelerator_gtk.h +++ b/ui/base/accelerators/accelerator_gtk.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_BASE_MODELS_ACCELERATOR_GTK_H_ -#define UI_BASE_MODELS_ACCELERATOR_GTK_H_ +#ifndef UI_BASE_ACCELERATORS_ACCELERATOR_GTK_H_ +#define UI_BASE_ACCELERATORS_ACCELERATOR_GTK_H_ #pragma once #include <gdk/gdk.h> +#include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" #include "ui/base/keycodes/keyboard_codes_posix.h" -#include "ui/base/models/accelerator.h" namespace ui { @@ -56,4 +56,4 @@ class AcceleratorGtk : public Accelerator { } // namespace ui -#endif // UI_BASE_MODELS_ACCELERATOR_GTK_H_ +#endif // UI_BASE_ACCELERATORS_ACCELERATOR_GTK_H_ diff --git a/ui/base/accelerator_manager.cc b/ui/base/accelerators/accelerator_manager.cc index 8ebfefd..c675211 100644 --- a/ui/base/accelerator_manager.cc +++ b/ui/base/accelerators/accelerator_manager.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/accelerator_manager.h" +#include "ui/base/accelerators/accelerator_manager.h" #include <algorithm> diff --git a/ui/base/accelerator_manager.h b/ui/base/accelerators/accelerator_manager.h index 703d2c4..50c73c0 100644 --- a/ui/base/accelerator_manager.h +++ b/ui/base/accelerators/accelerator_manager.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_BASE_ACCELERATOR_MANAGER_H_ -#define UI_BASE_ACCELERATOR_MANAGER_H_ +#ifndef UI_BASE_ACCELERATORS_ACCELERATOR_MANAGER_H_ +#define UI_BASE_ACCELERATORS_ACCELERATOR_MANAGER_H_ #pragma once #include <list> #include <map> #include "base/basictypes.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/ui_export.h" namespace ui { @@ -62,4 +62,4 @@ class UI_EXPORT AcceleratorManager { } // namespace ui -#endif // UI_BASE_ACCELERATOR_MANAGER_H_ +#endif // UI_BASE_ACCELERATORS_ACCELERATOR_MANAGER_H_ diff --git a/ui/base/ui_base_exports.cc b/ui/base/ui_base_exports.cc index fccbcb6..5759e9b 100644 --- a/ui/base/ui_base_exports.cc +++ b/ui/base/ui_base_exports.cc @@ -7,5 +7,5 @@ // linker will know to include the symbols, defined by these headers, in the // resulting dynamic library (ui.dll). -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/models/table_model_observer.h" @@ -40,8 +40,13 @@ '../third_party/icu/icu.gyp:icuuc', ], 'sources': [ - 'base/accelerator_manager.cc', - 'base/accelerator_manager.h', + 'base/accelerators/accelerator.cc', + 'base/accelerators/accelerator.h', + 'base/accelerators/accelerator_cocoa.h', + 'base/accelerators/accelerator_cocoa.mm', + 'base/accelerators/accelerator_gtk.h', + 'base/accelerators/accelerator_manager.cc', + 'base/accelerators/accelerator_manager.h', 'base/accessibility/accessibility_types.h', 'base/accessibility/accessible_text_utils.cc', 'base/accessibility/accessible_text_utils.h', @@ -153,11 +158,6 @@ 'base/message_box_flags.h', 'base/message_box_win.cc', 'base/message_box_win.h', - 'base/models/accelerator_cocoa.h', - 'base/models/accelerator_cocoa.mm', - 'base/models/accelerator_gtk.h', - 'base/models/accelerator.cc', - 'base/models/accelerator.h', 'base/models/button_menu_item_model.cc', 'base/models/button_menu_item_model.h', 'base/models/combobox_model.h', diff --git a/ui/views/controls/tree/tree_view.cc b/ui/views/controls/tree/tree_view.cc index 7bd7c43..5913633 100644 --- a/ui/views/controls/tree/tree_view.cc +++ b/ui/views/controls/tree/tree_view.cc @@ -11,11 +11,11 @@ #include "base/stl_util.h" #include "base/win/win_util.h" #include "grit/ui_resources.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util_win.h" -#include "ui/base/models/accelerator.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" #include "ui/gfx/canvas_skia.h" diff --git a/ui/views/focus/accelerator_handler_gtk_unittest.cc b/ui/views/focus/accelerator_handler_gtk_unittest.cc index f52a256..cdf24e1 100644 --- a/ui/views/focus/accelerator_handler_gtk_unittest.cc +++ b/ui/views/focus/accelerator_handler_gtk_unittest.cc @@ -5,7 +5,7 @@ #include <gdk/gdkkeysyms.h> #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/gfx/rect.h" #include "ui/views/focus/accelerator_handler.h" #include "ui/views/focus/focus_manager.h" diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc index 0a44877..61567bc 100644 --- a/ui/views/focus/focus_manager.cc +++ b/ui/views/focus/focus_manager.cc @@ -9,9 +9,9 @@ #include "base/auto_reset.h" #include "base/logging.h" #include "build/build_config.h" -#include "ui/base/accelerator_manager.h" +#include "ui/base/accelerators/accelerator.h" +#include "ui/base/accelerators/accelerator_manager.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/models/accelerator.h" #include "ui/views/focus/focus_search.h" #include "ui/views/focus/view_storage.h" #include "ui/views/focus/widget_focus_manager.h" diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h index b428399..8a9085a 100644 --- a/ui/views/focus/focus_manager.h +++ b/ui/views/focus/focus_manager.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/events/event.h" #include "views/views_export.h" diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc index 21a6d8f..c55e4e0 100644 --- a/ui/views/focus/focus_manager_unittest.cc +++ b/ui/views/focus/focus_manager_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/utf_string_conversions.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/models/accelerator.h" #include "ui/views/focus/accelerator_handler.h" #include "ui/views/focus/focus_manager_factory.h" #include "ui/views/focus/focus_manager_test.h" @@ -13,8 +13,8 @@ #include "views/controls/textfield/textfield.h" #if !defined(USE_AURA) -#include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h" +#include "views/controls/tabbed_pane/tabbed_pane.h" #endif #if defined(OS_LINUX) diff --git a/views/accessible_pane_view.h b/views/accessible_pane_view.h index 80c098b..655ebd9 100644 --- a/views/accessible_pane_view.h +++ b/views/accessible_pane_view.h @@ -9,7 +9,7 @@ #include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/views/focus/focus_manager.h" #include "views/view.h" diff --git a/views/accessible_pane_view_unittest.cc b/views/accessible_pane_view_unittest.cc index 96b8b09..e51e470 100644 --- a/views/accessible_pane_view_unittest.cc +++ b/views/accessible_pane_view_unittest.cc @@ -4,7 +4,7 @@ #include "views/accessible_pane_view.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/widget.h" diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc index f08ddd1..66a1993 100644 --- a/views/controls/menu/menu_win.cc +++ b/views/controls/menu/menu_win.cc @@ -9,10 +9,10 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/string_util.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" -#include "ui/base/models/accelerator.h" #include "ui/base/win/window_impl.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc index 62d05cb..7269775 100644 --- a/views/controls/menu/native_menu_gtk.cc +++ b/views/controls/menu/native_menu_gtk.cc @@ -14,9 +14,9 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/models/accelerator.h" #include "ui/base/models/menu_model.h" #include "ui/gfx/font.h" #include "ui/gfx/gtk_util.h" diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc index 1b6e738..5081d92 100644 --- a/views/controls/menu/native_menu_win.cc +++ b/views/controls/menu/native_menu_win.cc @@ -13,10 +13,10 @@ #include "base/string_util.h" #include "base/win/wrapped_window_proc.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" -#include "ui/base/models/accelerator.h" #include "ui/base/win/hwnd_util.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" diff --git a/views/view.h b/views/view.h index bbb10a8..e93a125 100644 --- a/views/view.h +++ b/views/view.h @@ -17,8 +17,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/models/accelerator.h" #include "ui/gfx/compositor/layer_delegate.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 1eabedd..c948c3d 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -9,9 +9,9 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "testing/gmock/include/gmock/gmock.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/models/accelerator.h" #include "ui/base/models/simple_menu_model.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/compositor/compositor.h" |