diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
29 files changed, 33 insertions, 33 deletions
diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc index 13524bb..84f880d 100644 --- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc +++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc @@ -6,8 +6,6 @@ #include "base/command_line.h" #include "base/i18n/number_formatting.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/apps/app_window_registry_util.h" @@ -24,6 +22,8 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/notification_service.h" #include "content/public/common/content_switches.h" #include "extensions/browser/app_window/app_window.h" diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm index fc4f446..643d2d7 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm @@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h" #include "chrome/browser/ui/browser.h" @@ -15,6 +14,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "components/autofill/core/browser/autofill_test_utils.h" #include "components/autofill/core/common/form_data.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h index a831ab3..7c8ccee 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h @@ -13,8 +13,8 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "base/prefs/pref_change_registrar.h" #include "components/bookmarks/browser/bookmark_model_observer.h" +#include "components/prefs/pref_change_registrar.h" class Profile; @class BookmarkBarController; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm index fedc42e..16fa24f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm @@ -5,11 +5,11 @@ #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h" #include "base/bind.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/common/bookmark_pref_names.h" +#include "components/prefs/pref_service.h" using bookmarks::BookmarkModel; using bookmarks::BookmarkNode; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index fb6d1c0..eeea542 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -9,7 +9,6 @@ #include "base/mac/bundle_locations.h" #include "base/mac/sdk_forward_declarations.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_stats.h" @@ -56,6 +55,7 @@ #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/bookmarks/managed/managed_bookmark_service.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_registry.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm index df3a5f9..82305ab 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm @@ -4,13 +4,13 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/prefs/pref_service.h" #include "components/url_formatter/url_fixer.h" #include "components/user_prefs/user_prefs.h" diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index a070c77..dadf9ad 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -9,7 +9,6 @@ #include "base/logging.h" #import "base/mac/sdk_forward_declarations.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -55,6 +54,7 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/bookmarks/common/bookmark_pref_names.h" +#include "components/prefs/pref_service.h" #include "components/translate/core/browser/language_state.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm index 5676d0a..6c5deda 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm @@ -14,8 +14,6 @@ #import "base/mac/scoped_nsobject.h" #import "base/mac/sdk_forward_declarations.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/fullscreen.h" #include "chrome/browser/profiles/profile.h" @@ -47,6 +45,8 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" #include "chrome/common/chrome_switches.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #import "ui/base/cocoa/focus_tracker.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm index 0f32ce3..b98694e 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm @@ -7,7 +7,6 @@ #include "base/mac/mac_util.h" #import "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/ui/browser_list.h" @@ -22,6 +21,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "components/bookmarks/common/bookmark_pref_names.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm index 2d28754..d3c29a4 100644 --- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm +++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/mac/scoped_nsobject.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_registry_simple.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" @@ -19,6 +18,7 @@ #include "chrome/browser/ui/cocoa/confirm_quit.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_registry_simple.h" #import "ui/base/accelerators/platform_accelerator_cocoa.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm index 5cc1a6b6..679c212 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm @@ -8,7 +8,6 @@ #include "base/mac/bundle_locations.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" @@ -23,6 +22,7 @@ #include "chrome/grit/generated_resources.h" #include "components/content_settings/core/browser/cookie_settings.h" #include "components/content_settings/core/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/cocoa/dev_tools_controller.mm b/chrome/browser/ui/cocoa/dev_tools_controller.mm index 32daab3..4318027 100644 --- a/chrome/browser/ui/cocoa/dev_tools_controller.mm +++ b/chrome/browser/ui/cocoa/dev_tools_controller.mm @@ -9,10 +9,10 @@ #include <Cocoa/Cocoa.h> -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/ui/cocoa/view_id_util.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_contents.h" #include "ui/base/cocoa/base_view.h" #include "ui/base/cocoa/focus_tracker.h" diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index 2fa51f9..2da7756 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -25,10 +25,10 @@ #include "url/gurl.h" #if defined(GOOGLE_CHROME_BUILD) -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/google_update_settings.h" +#include "components/prefs/pref_service.h" #endif @interface FirstRunDialogController (PrivateMethods) diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm index a400f00..35a6e9a 100644 --- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm +++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm @@ -13,7 +13,6 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/infobars/infobar_service.h" #import "chrome/browser/mac/keystone_glue.h" @@ -27,6 +26,7 @@ #include "chrome/grit/generated_resources.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_contents.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm index 159d07d..6bd960b 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm @@ -6,7 +6,6 @@ #include <algorithm> -#include "base/prefs/pref_service.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" @@ -19,6 +18,7 @@ #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" #include "chrome/browser/ui/content_settings/content_setting_image_model.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/web_contents.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index 435d052..4112958 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h @@ -14,12 +14,12 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "chrome/browser/ui/location_bar/location_bar.h" #include "chrome/browser/ui/omnibox/chrome_omnibox_edit_controller.h" #include "components/content_settings/core/common/content_settings_types.h" +#include "components/prefs/pref_member.h" #include "components/ui/zoom/zoom_event_manager_observer.h" @class AutocompleteTextField; diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index f736c22..3280b81 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" @@ -54,6 +53,7 @@ #include "chrome/common/pref_names.h" #include "components/bookmarks/common/bookmark_pref_names.h" #import "components/omnibox/browser/omnibox_popup_model.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "components/translate/core/browser/language_state.h" diff --git a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h index f28262f..8301adb 100644 --- a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h +++ b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h @@ -11,7 +11,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_member.h" +#include "components/prefs/pref_member.h" #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_tray_delegate.h" diff --git a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm index cc6a667..3a624e5 100644 --- a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm +++ b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.mm @@ -7,12 +7,12 @@ #include "base/bind.h" #include "base/i18n/number_formatting.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "chrome/browser/browser_process.h" #include "chrome/common/pref_names.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "ui/base/l10n/l10n_util.h" #import "ui/base/l10n/l10n_util_mac.h" #import "ui/message_center/cocoa/popup_collection.h" diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm index 8d9ecfd..8249646 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm @@ -10,7 +10,6 @@ #include "base/mac/bundle_locations.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -50,6 +49,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/browser/signin_metrics.h" diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm b/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm index eb88416..d13a8b1 100644 --- a/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm @@ -5,7 +5,6 @@ #include "chrome/browser/ui/cocoa/profiles/user_manager_mac.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "chrome/browser/profiles/profile_window.h" #include "chrome/browser/ui/user_manager.h" @@ -13,6 +12,7 @@ #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile_manager.h" +#include "components/prefs/pref_service.h" class UserManagerMacTest : public BrowserWithTestWindowTest { public: diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 4e64b91..b02125c 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -15,7 +15,6 @@ #include "base/mac/scoped_nsautorelease_pool.h" #include "base/macros.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "base/strings/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" @@ -51,6 +50,7 @@ #include "components/metrics/proto/omnibox_event.pb.h" #include "components/omnibox/browser/autocomplete_classifier.h" #include "components/omnibox/browser/autocomplete_match.h" +#include "components/prefs/pref_service.h" #include "components/url_formatter/url_fixer.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm index 518fec6..5ed4fbf 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac.mm @@ -11,13 +11,13 @@ #include "base/mac/bundle_locations.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/browser_process.h" #import "chrome/browser/ui/cocoa/window_size_autosaver.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_service.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h index 89612c3..0de6dab8 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h @@ -9,10 +9,10 @@ #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_member.h" #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h" #import "chrome/browser/ui/cocoa/url_drop_target.h" #import "chrome/browser/ui/cocoa/view_resizer.h" +#include "components/prefs/pref_member.h" #import "ui/base/cocoa/tracking_area.h" @class AutocompleteTextField; diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index dcd38d5..5ab43bd 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -12,7 +12,6 @@ #include "base/mac/sdk_forward_declarations.h" #include "base/macros.h" #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -55,6 +54,7 @@ #include "components/omnibox/browser/autocomplete_classifier.h" #include "components/omnibox/browser/autocomplete_match.h" #include "components/omnibox/browser/omnibox_view.h" +#include "components/prefs/pref_service.h" #include "components/search_engines/template_url_service.h" #include "components/url_formatter/url_fixer.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm index 10c8868..7167694 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm @@ -6,7 +6,6 @@ #import "base/mac/scoped_nsobject.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" @@ -21,6 +20,7 @@ #import "chrome/browser/ui/cocoa/view_resizer_pong.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "components/prefs/pref_service.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm index 460eb66..bb96466 100644 --- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/devtools/devtools_window_testing.h" @@ -20,6 +19,7 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/test/bookmark_test_helpers.h" +#include "components/prefs/pref_service.h" #include "extensions/common/switches.h" using bookmarks::BookmarkModel; diff --git a/chrome/browser/ui/cocoa/window_size_autosaver.mm b/chrome/browser/ui/cocoa/window_size_autosaver.mm index c5716f8..180ec1d 100644 --- a/chrome/browser/ui/cocoa/window_size_autosaver.mm +++ b/chrome/browser/ui/cocoa/window_size_autosaver.mm @@ -6,8 +6,8 @@ #import "chrome/browser/ui/cocoa/window_size_autosaver.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" // If the window width stored in the prefs is smaller than this, the size is // not restored but instead cleared from the profile -- to protect users from diff --git a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm index 38d94ad..65f86c0 100644 --- a/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm +++ b/chrome/browser/ui/cocoa/window_size_autosaver_unittest.mm @@ -7,11 +7,11 @@ #import "chrome/browser/ui/cocoa/window_size_autosaver.h" #include "base/mac/scoped_nsobject.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "chrome/test/base/testing_profile.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" |