diff options
Diffstat (limited to 'chrome')
50 files changed, 62 insertions, 58 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 811185b..06f9e19 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -92,8 +92,8 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/plugin_service.h" #include "content/public/browser/user_metrics.h" -#include "extensions/browser/extension_system.h" #include "extensions/browser/extension_registry.h" +#include "extensions/browser/extension_system.h" #include "net/base/filename_util.h" #include "ui/base/cocoa/focus_window_set.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm index 4b3d958..288b24e 100644 --- a/chrome/browser/app_controller_mac_browsertest.mm +++ b/chrome/browser/app_controller_mac_browsertest.mm @@ -17,7 +17,6 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "components/bookmarks/browser/bookmark_model.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" @@ -38,6 +37,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/signin/core/common/profile_management_switches.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.mm b/chrome/browser/local_discovery/service_discovery_client_mac.mm index 6047d2f..0510efc 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mac.mm +++ b/chrome/browser/local_discovery/service_discovery_client_mac.mm @@ -4,8 +4,8 @@ #include "chrome/browser/local_discovery/service_discovery_client_mac.h" -#import <Foundation/Foundation.h> #import <arpa/inet.h> +#import <Foundation/Foundation.h> #import <net/if_dl.h> #include "base/memory/singleton.h" diff --git a/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm b/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm index 4cf4557..969fe88 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm +++ b/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/mac/scoped_nsobject.h" #include "base/message_loop/message_loop.h" -#include "chrome/common/local_discovery/service_discovery_client.h" #include "chrome/browser/local_discovery/service_discovery_client_mac.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" +#include "chrome/common/local_discovery/service_discovery_client.h" #include "testing/gtest_mac.h" @interface TestNSNetService : NSNetService { diff --git a/chrome/browser/mac/dock.mm b/chrome/browser/mac/dock.mm index 03d1440..d3a4e16 100644 --- a/chrome/browser/mac/dock.mm +++ b/chrome/browser/mac/dock.mm @@ -5,8 +5,8 @@ #import "chrome/browser/mac/dock.h" #include <ApplicationServices/ApplicationServices.h> -#import <Foundation/Foundation.h> #include <CoreFoundation/CoreFoundation.h> +#import <Foundation/Foundation.h> #include <signal.h> #include "base/logging.h" diff --git a/chrome/browser/platform_util_mac.mm b/chrome/browser/platform_util_mac.mm index 8ce07be..e156ad0 100644 --- a/chrome/browser/platform_util_mac.mm +++ b/chrome/browser/platform_util_mac.mm @@ -9,13 +9,13 @@ #include <CoreServices/CoreServices.h> #include "base/bind.h" -#include "base/files/file_util.h" #include "base/files/file_path.h" +#include "base/files/file_util.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #import "base/mac/mac_util.h" -#import "base/mac/sdk_forward_declarations.h" #include "base/mac/scoped_aedesc.h" +#import "base/mac/sdk_forward_declarations.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/platform_util_internal.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm index 3668b91..5169e7b 100644 --- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm +++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "testing/gtest/include/gtest/gtest.h" -#import "chrome/browser/ui/cocoa/cocoa_test_helper.h" +#import "chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.h" #include "base/mac/scoped_nsobject.h" #import "base/mac/sdk_forward_declarations.h" -#import "chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.h" +#import "chrome/browser/ui/cocoa/cocoa_test_helper.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #import "third_party/ocmock/OCMock/OCMock.h" #import "third_party/ocmock/ocmock_extensions.h" -#include "third_party/WebKit/public/web/WebInputEvent.h" @interface HistorySwiper (MacHistorySwiperTest) - (BOOL)systemSettingsAllowHistorySwiping:(NSEvent*)event; diff --git a/chrome/browser/themes/theme_service_mac.mm b/chrome/browser/themes/theme_service_mac.mm index 3c46912..1b9a541 100644 --- a/chrome/browser/themes/theme_service_mac.mm +++ b/chrome/browser/themes/theme_service_mac.mm @@ -14,7 +14,6 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image.h" -#include "skia/ext/skia_utils_mac.h" NSString* const kBrowserThemeDidChangeNotification = @"BrowserThemeDidChangeNotification"; diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/accelerators_cocoa_browsertest.mm index ce3f277..dff475c 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa_browsertest.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa_browsertest.mm @@ -7,9 +7,9 @@ #include "base/logging.h" #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" #include "chrome/test/base/in_process_browser_test.h" +#include "testing/gtest_mac.h" #include "ui/base/accelerators/platform_accelerator_cocoa.h" #import "ui/events/keycodes/keyboard_code_conversion_mac.h" -#include "testing/gtest_mac.h" typedef InProcessBrowserTest AcceleratorsCocoaBrowserTest; diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm index 7a16118..663adf3 100644 --- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm +++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm @@ -11,9 +11,9 @@ #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h" #include "chrome/browser/apps/app_window_registry_util.h" #include "chrome/browser/profiles/profile.h" -#import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h" #include "chrome/grit/generated_resources.h" #include "extensions/browser/app_window/app_window.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/ui/cocoa/autofill/autofill_header.mm b/chrome/browser/ui/cocoa/autofill/autofill_header.mm index 682e2d3..a3aa2a6 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_header.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_header.mm @@ -4,10 +4,10 @@ #import "chrome/browser/ui/cocoa/autofill/autofill_header.h" -#import "chrome/browser/ui/cocoa/autofill/autofill_account_chooser.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h" #include "chrome/browser/ui/chrome_style.h" +#import "chrome/browser/ui/cocoa/autofill/autofill_account_chooser.h" #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h" namespace { diff --git a/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm index e6d37e2..29132ad 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm @@ -10,10 +10,10 @@ #include "base/strings/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/autofill/autofill_dialog_sign_in_delegate.h" -#import "chrome/browser/ui/cocoa/browser_window_utils.h" -#include "chrome/browser/ui/cocoa/chrome_event_processing_window.h" #include "chrome/browser/ui/chrome_style.h" #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h" +#import "chrome/browser/ui/cocoa/browser_window_utils.h" +#include "chrome/browser/ui/cocoa/chrome_event_processing_window.h" #include "components/autofill/content/browser/wallet/wallet_service_url.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/cocoa/autofill/autofill_textfield_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_textfield_unittest.mm index dc49800..628c15d5 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_textfield_unittest.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_textfield_unittest.mm @@ -6,8 +6,8 @@ #import "base/mac/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" -#include "testing/gtest_mac.h" #include "testing/gtest/include/gtest/gtest.h" +#include "testing/gtest_mac.h" #include "testing/platform_test.h" #include "ui/events/test/cocoa_test_event_utils.h" diff --git a/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.mm b/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.mm index 274860d..b9d8b0c 100644 --- a/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.mm +++ b/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.mm @@ -10,8 +10,8 @@ #include "chrome/browser/ui/autofill/new_credit_card_bubble_controller.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" -#import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/base_bubble_controller.h" +#import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.mm index c8972c4..278bfd9 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_hover_state.h" + #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" @interface BookmarkBarFolderHoverState(Private) diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index dab05bb..fe71e6e 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -54,8 +54,8 @@ #include "components/translate/core/browser/language_state.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_details.h" -#include "content/public/browser/notification_source.h" #include "content/public/browser/notification_service.h" +#include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/ui/cocoa/browser_window_factory_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_factory_cocoa.mm index 8a6214a..aa8a77a 100644 --- a/chrome/browser/ui/cocoa/browser_window_factory_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_factory_cocoa.mm @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "chrome/browser/ui/cocoa/browser_window_controller.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/cocoa/browser_window_controller.h" // Create the controller for the Browser, which handles loading the browser // window from the nib. The controller takes ownership of |browser|. diff --git a/chrome/browser/ui/cocoa/bubble_combobox.mm b/chrome/browser/ui/cocoa/bubble_combobox.mm index ea4ad14..b093fcc 100644 --- a/chrome/browser/ui/cocoa/bubble_combobox.mm +++ b/chrome/browser/ui/cocoa/bubble_combobox.mm @@ -4,8 +4,8 @@ #import "chrome/browser/ui/cocoa/bubble_combobox.h" -#include "ui/base/models/combobox_model.h" #include "base/strings/sys_string_conversions.h" +#include "ui/base/models/combobox_model.h" @implementation BubbleCombobox diff --git a/chrome/browser/ui/cocoa/chrome_event_processing_window.mm b/chrome/browser/ui/cocoa/chrome_event_processing_window.mm index 43d0feb..a493d84 100644 --- a/chrome/browser/ui/cocoa/chrome_event_processing_window.mm +++ b/chrome/browser/ui/cocoa/chrome_event_processing_window.mm @@ -5,10 +5,10 @@ #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" #include "base/logging.h" +#include "chrome/browser/global_keyboard_shortcuts_mac.h" #import "chrome/browser/ui/cocoa/browser_command_executor.h" #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" -#include "chrome/browser/global_keyboard_shortcuts_mac.h" #import "content/public/browser/render_widget_host_view_mac_base.h" typedef int (*KeyToCommandMapper)(bool, bool, bool, bool, int, unichar); diff --git a/chrome/browser/ui/cocoa/command_observer_bridge.mm b/chrome/browser/ui/cocoa/command_observer_bridge.mm index aa01368..4bd935d 100644 --- a/chrome/browser/ui/cocoa/command_observer_bridge.mm +++ b/chrome/browser/ui/cocoa/command_observer_bridge.mm @@ -3,9 +3,9 @@ // found in the LICENSE file. #import "chrome/browser/ui/cocoa/command_observer_bridge.h" -#include "chrome/browser/command_updater.h" #include "base/logging.h" +#include "chrome/browser/command_updater.h" CommandObserverBridge::CommandObserverBridge( id<CommandObserverProtocol> observer, CommandUpdater* commands) diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert_unittest.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert_unittest.mm index b5fe7a7..6bb9ffd 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert_unittest.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert_unittest.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.h" + #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "testing/gtest_mac.h" diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm index c40a346..f043fad 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm @@ -4,8 +4,8 @@ #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h" -#include "base/memory/scoped_ptr.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet.h" #import "chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.h" #include "components/guest_view/browser/guest_view_base.h" diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm index e712f95..dfd4bfa 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm @@ -16,10 +16,10 @@ #include "grit/theme_resources.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h" -#include "ui/gfx/text_elider.h" #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/font_list.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" +#include "ui/gfx/text_elider.h" // Distance from top border to icon. const CGFloat kImagePaddingTop = 7; diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm index 7ffaf4e..f562e19 100644 --- a/chrome/browser/ui/cocoa/download/download_item_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm @@ -29,9 +29,9 @@ #include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/gfx/text_elider.h" #include "ui/gfx/font.h" #include "ui/gfx/image/image.h" +#include "ui/gfx/text_elider.h" using content::DownloadItem; using extensions::ExperienceSamplingEvent; diff --git a/chrome/browser/ui/cocoa/download/download_shelf_mac.mm b/chrome/browser/ui/cocoa/download/download_shelf_mac.mm index cd21a38..cf14be7 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_mac.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_mac.mm @@ -6,8 +6,8 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/ui/browser.h" -#import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" #include "chrome/browser/ui/cocoa/download/download_item_mac.h" +#import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" DownloadShelfMac::DownloadShelfMac(Browser* browser, DownloadShelfController* controller) diff --git a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm index b352004..929d9a6 100644 --- a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm @@ -18,9 +18,9 @@ #include "content/public/test/test_utils.h" #include "testing/gtest_mac.h" #include "ui/base/accelerators/platform_accelerator_cocoa.h" +#import "ui/base/cocoa/controls/hyperlink_text_view.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" -#import "ui/base/cocoa/controls/hyperlink_text_view.h" using content::SiteInstance; using content::WebContents; diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm index 7bb8e22..be27ff4 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm @@ -13,7 +13,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" #import "chrome/browser/ui/cocoa/themed_window.h" @@ -21,6 +20,7 @@ #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" +#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm index 3d314f0..55149f3 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm @@ -9,13 +9,13 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_toolbar_model.h" +#include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" -#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #include "chrome/test/base/interactive_test_utils.h" #include "extensions/common/feature_switch.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm index 6b8a56c..70ace33 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm @@ -16,11 +16,10 @@ #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" -#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" -#import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" #import "chrome/browser/ui/cocoa/themed_window.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" +#import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h" #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/ui/cocoa/extensions/bundle_util.mm b/chrome/browser/ui/cocoa/extensions/bundle_util.mm index 6207e90..0315a9d 100644 --- a/chrome/browser/ui/cocoa/extensions/bundle_util.mm +++ b/chrome/browser/ui/cocoa/extensions/bundle_util.mm @@ -7,9 +7,9 @@ #include "base/mac/mac_util.h" #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" +#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_util_mac.h" -#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" namespace { diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm index 4330e98..9197c055 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm @@ -4,11 +4,11 @@ #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h" +#include "chrome/browser/extensions/extension_install_prompt_show_params.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h" #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h" #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h" -#include "chrome/browser/extensions/extension_install_prompt_show_params.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm index 643e6c9..0897b25 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm @@ -10,11 +10,11 @@ #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/extension_view_host.h" #include "chrome/browser/extensions/extension_view_host_factory.h" -#include "chrome/common/url_constants.h" #include "chrome/browser/ui/browser.h" #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" #import "chrome/browser/ui/cocoa/extensions/extension_view_mac.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" +#include "chrome/common/url_constants.h" #include "components/web_modal/popup_manager.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/devtools_agent_host.h" diff --git a/chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.mm b/chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.mm index da39845..925b24f 100644 --- a/chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.mm +++ b/chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.mm @@ -5,8 +5,8 @@ #import "chrome/browser/ui/cocoa/extensions/media_gallery_list_entry_view.h" #include "base/strings/sys_string_conversions.h" -#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_utils.h" #include "chrome/browser/ui/chrome_style.h" +#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_utils.h" #include "grit/theme_resources.h" #import "ui/base/cocoa/menu_controller.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.mm b/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.mm index 802f4ed..ef263e8 100644 --- a/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.mm @@ -6,9 +6,9 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" +#include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa.h" -#include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #include "ui/base/l10n/l10n_util_mac.h" // ManagePasswordsIconCocoa diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm index e9d92b8..61ef358 100644 --- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm +++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" + #include "base/auto_reset.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_window.h" -#import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/browser/zoom_bubble_controller.h" +#import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" -#import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" #include "chrome/browser/ui/cocoa/run_loop_testing.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/toolbar/test_toolbar_model.h" diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm index aba1536..7c8ecb6 100644 --- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm @@ -5,8 +5,8 @@ #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h" #include "base/bind.h" -#include "base/strings/utf_string_conversions.h" #include "base/run_loop.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/media/desktop_media_list_observer.h" #include "chrome/browser/media/fake_desktop_media_list.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/ui/cocoa/new_tab_button.mm b/chrome/browser/ui/cocoa/new_tab_button.mm index e3e88f0..176c80c 100644 --- a/chrome/browser/ui/cocoa/new_tab_button.mm +++ b/chrome/browser/ui/cocoa/new_tab_button.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #import "chrome/browser/ui/cocoa/new_tab_button.h" + #import "chrome/browser/ui/cocoa/image_button_cell.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm index 1f3fc8a..acfd988 100644 --- a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm @@ -10,8 +10,8 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/pref_names.h" -#include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/scoped_testing_local_state.h" +#include "chrome/test/base/testing_browser_process.h" #import "ui/gfx/test/ui_cocoa_test_helper.h" #import "ui/message_center/cocoa/status_item_view.h" #include "ui/message_center/message_center.h" diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.mm index 940deb6..c66312c 100644 --- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller.mm @@ -8,11 +8,11 @@ #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" -#import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_manage_view_controller.h" #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_account_chooser_view_controller.h" #import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_blacklist_view_controller.h" #import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_confirmation_view_controller.h" +#import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_manage_view_controller.h" #include "ui/base/cocoa/window_size_constants.h" @interface ManagePasswordsBubbleController () diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller_unittest.mm index 6e90582..ff4f479 100644 --- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller_unittest.mm @@ -12,10 +12,10 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" +#import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_blacklist_view_controller.h" #import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_manage_view_controller.h" #import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller.h" #include "chrome/browser/ui/cocoa/passwords/manage_passwords_controller_test.h" -#import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_blacklist_view_controller.h" #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h" diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller.mm index fbc1157..bf30680 100644 --- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller.mm +++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller.mm @@ -7,9 +7,9 @@ #import "chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller.h" #include "base/strings/sys_string_conversions.h" +#include "chrome/browser/ui/chrome_style.h" #import "chrome/browser/ui/cocoa/bubble_combobox.h" #import "chrome/browser/ui/cocoa/passwords/manage_password_item_view_controller.h" -#include "chrome/browser/ui/chrome_style.h" #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" #include "chrome/browser/ui/passwords/save_password_refusal_combobox_model.h" #include "chrome/grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm index a841a94..a3a598b 100644 --- a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm @@ -7,13 +7,13 @@ #include "base/mac/foundation_util.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/profiles/profile_info_cache_observer.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h" +#include "chrome/browser/profiles/profile_info_cache_observer.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_metrics.h" -#include "chrome/browser/signin/signin_header_helper.h" -#include "chrome/browser/profiles/profiles_state.h" #include "chrome/browser/profiles/profile_window.h" +#include "chrome/browser/profiles/profiles_state.h" +#include "chrome/browser/signin/signin_header_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm index 3f29a4c..efd6934 100644 --- a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm @@ -9,10 +9,10 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" -#include "chrome/browser/supervised_user/supervised_user_service.h" -#include "chrome/browser/supervised_user/supervised_user_service_factory.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/search_engines/template_url_service_factory.h" +#include "chrome/browser/supervised_user/supervised_user_service.h" +#include "chrome/browser/supervised_user/supervised_user_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/cocoa/profiles/avatar_label_button_unittest.mm b/chrome/browser/ui/cocoa/profiles/avatar_label_button_unittest.mm index a115695..a301626 100644 --- a/chrome/browser/ui/cocoa/profiles/avatar_label_button_unittest.mm +++ b/chrome/browser/ui/cocoa/profiles/avatar_label_button_unittest.mm @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "chrome/browser/ui/cocoa/profiles/avatar_label_button.h" + #import <Cocoa/Cocoa.h> #include "base/mac/scoped_nsobject.h" -#import "chrome/browser/ui/cocoa/profiles/avatar_label_button.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm index 7588e5c..016224a 100644 --- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import <Cocoa/Cocoa.h> -#import <Carbon/Carbon.h> // kVK_Return. - #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" +#import <Carbon/Carbon.h> // kVK_Return. +#import <Cocoa/Cocoa.h> + #include "base/mac/bundle_locations.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa_unittest.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa_unittest.mm index 6cd7030..791cd83 100644 --- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa_unittest.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.h" + #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" namespace { diff --git a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.mm b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.mm index 17fe295..d2003a3 100644 --- a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.mm +++ b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.mm @@ -4,10 +4,10 @@ #include "chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h" +#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" #include "content/public/browser/web_contents.h" using content::WebContents; diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm index 9da24a6..c12710e 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm @@ -10,10 +10,10 @@ #import "base/mac/sdk_forward_declarations.h" #import "chrome/browser/ui/cocoa/tabs/tab_controller.h" #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h" +#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" #import "chrome/browser/ui/cocoa/tabs/tab_view.h" #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h" -#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h" const CGFloat kTearDistance = 36.0; diff --git a/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm b/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm index 3becf15..67c1b58 100644 --- a/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm +++ b/chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.mm @@ -5,9 +5,9 @@ #import "chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.h" #include "chrome/app/chrome_command_ids.h" +#include "chrome/browser/command_updater.h" #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" #import "chrome/browser/ui/cocoa/view_id_util.h" -#include "chrome/browser/command_updater.h" #include "chrome/grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/accelerators/platform_accelerator_cocoa.h" 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 a5e048c..72df731 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm @@ -17,9 +17,9 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" +#import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" -#import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" #import "chrome/browser/ui/cocoa/l10n_util.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h" |