diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
22 files changed, 26 insertions, 26 deletions
diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm index 31af858..73e5167 100644 --- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm +++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm @@ -10,9 +10,9 @@ #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" #include "chrome/test/in_process_browser_test.h" -#include "gfx/size.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h" +#include "ui/gfx/size.h" typedef InProcessBrowserTest BrowserCrApplicationAppleScriptTest; diff --git a/chrome/browser/ui/cocoa/base_view.h b/chrome/browser/ui/cocoa/base_view.h index 0a8da9e..bb2aeed 100644 --- a/chrome/browser/ui/cocoa/base_view.h +++ b/chrome/browser/ui/cocoa/base_view.h @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #include "base/scoped_nsobject.h" -#include "gfx/rect.h" +#include "ui/gfx/rect.h" // A view that provides common functionality that many views will need: // - Automatic registration for mouse-moved events. diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm index 16fb677..94c364d 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm @@ -4,15 +4,15 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h" -#include "gfx/rect.h" #include "chrome/browser/ntp_background_util.h" #include "chrome/browser/themes/browser_theme_provider.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/themed_window.h" -#include "gfx/canvas_skia_paint.h" #include "ui/base/theme_provider.h" +#include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/rect.h" const CGFloat kBorderRadius = 3.0; diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index e5f813eb..cb7e64f 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -43,10 +43,10 @@ #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "gfx/rect.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" +#include "ui/gfx/rect.h" BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, BrowserWindowController* controller, diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm index 5e4dedb..37e300a 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm @@ -13,12 +13,12 @@ #import "chrome/browser/ui/cocoa/download/download_item_cell.h" #import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/themed_window.h" -#include "gfx/canvas_skia_paint.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/text_elider.h" +#include "ui/gfx/canvas_skia_paint.h" namespace { diff --git a/chrome/browser/ui/cocoa/download/download_util_mac.mm b/chrome/browser/ui/cocoa/download/download_util_mac.mm index 8d953f5..1c6808f 100644 --- a/chrome/browser/ui/cocoa/download/download_util_mac.mm +++ b/chrome/browser/ui/cocoa/download/download_util_mac.mm @@ -10,8 +10,8 @@ #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" #import "chrome/browser/ui/cocoa/dock_icon.h" -#include "gfx/native_widget_types.h" #include "skia/ext/skia_utils_mac.h" +#include "ui/gfx/native_widget_types.h" namespace download_util { diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm index 14701c8..6023a41 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm @@ -19,11 +19,11 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" -#include "gfx/canvas_skia_paint.h" -#include "gfx/rect.h" -#include "gfx/size.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" NSString* const kBrowserActionButtonUpdatedNotification = @"BrowserActionButtonUpdatedNotification"; diff --git a/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm index 24d4f16..c018dff 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm @@ -16,10 +16,10 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_resource.h" -#include "gfx/canvas_skia.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas_skia.h" namespace { const CGFloat kAnimationDuration = 0.12; diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.h b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.h index 519365c..3a91437 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.h +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.h @@ -9,8 +9,8 @@ #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_BRIDGE_H_ #pragma once -#include "gfx/native_widget_types.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/native_widget_types.h" class Browser; class Extension; diff --git a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h index 6254d6e..bb87ebf 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h +++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h @@ -7,9 +7,9 @@ #pragma once #include "base/basictypes.h" -#include "gfx/native_widget_types.h" -#include "gfx/size.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/size.h" class Browser; class ExtensionHost; diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index a66feb4..ea5a8b5 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -18,7 +18,6 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" -#include "gfx/codec/png_codec.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -26,6 +25,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/codec/png_codec.h" namespace { diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm index fae3d49..c292d5c 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm @@ -15,10 +15,10 @@ #include "chrome/browser/ui/cocoa/browser_test_helper.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/history_menu_bridge.h" -#include "gfx/codec/png_codec.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" +#include "ui/gfx/codec/png_codec.h" namespace { diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm index 12c34e8..c3346f9 100644 --- a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm +++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm @@ -15,9 +15,9 @@ #import "chrome/browser/ui/cocoa/browser_command_executor.h" #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" #include "chrome/common/native_web_keyboard_event.h" -#include "gfx/size.h" #include "ipc/ipc_message.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/gfx/size.h" // Thin bridge that routes notifications to // HtmlDialogWindowController's member variables. diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm index d68cf5c..2e91691 100644 --- a/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/html_dialog_window_controller_unittest.mm @@ -17,10 +17,10 @@ #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/test/browser_with_test_window_test.h" #include "chrome/test/testing_profile.h" -#include "gfx/size.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/size.h" namespace { diff --git a/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm b/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm index 07405d6..c98d3f0c 100644 --- a/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm +++ b/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm @@ -10,9 +10,9 @@ #include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/options/show_options_url.h" -#include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/gfx/native_widget_types.h" namespace browser { diff --git a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm index 745e64c..54b0fce 100644 --- a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.mm @@ -8,8 +8,8 @@ #include "base/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/image_utils.h" #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h" -#include "gfx/font.h" #include "ui/base/text/text_elider.h" +#include "ui/gfx/font.h" namespace { diff --git a/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.mm b/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.mm index cea53b1..802929c 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.mm @@ -6,7 +6,7 @@ #include "chrome/browser/ui/cocoa/notifications/balloon_controller.h" #import "chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.h" -#include "gfx/size.h" +#include "ui/gfx/size.h" #import <Cocoa/Cocoa.h> diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm index 93837a2..13f9d48 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm @@ -12,12 +12,12 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/bubble_view.h" -#include "gfx/point.h" #include "net/base/net_util.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" #include "ui/base/text/text_elider.h" +#include "ui/gfx/point.h" namespace { diff --git a/chrome/browser/ui/cocoa/styled_text_field_cell.mm b/chrome/browser/ui/cocoa/styled_text_field_cell.mm index ae81ef1..46fcd8b 100644 --- a/chrome/browser/ui/cocoa/styled_text_field_cell.mm +++ b/chrome/browser/ui/cocoa/styled_text_field_cell.mm @@ -7,10 +7,10 @@ #include "base/logging.h" #include "chrome/browser/themes/browser_theme_provider.h" #import "chrome/browser/ui/cocoa/themed_window.h" -#include "gfx/font.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/font.h" namespace { diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index d4a3716..41283b8 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -28,12 +28,12 @@ #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/pref_names.h" -#include "gfx/scoped_cg_context_state_mac.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/utils/mac/SkCGUtils.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/scoped_cg_context_state_mac.h" const int kTopGradientHeight = 15; diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 3f8f710..bc0de9a 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -49,7 +49,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" -#include "gfx/rect.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -57,6 +56,7 @@ #include "ui/base/models/accelerator_cocoa.h" #include "ui/base/models/menu_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/rect.h" namespace { diff --git a/chrome/browser/ui/cocoa/view_id_util.h b/chrome/browser/ui/cocoa/view_id_util.h index 6ea9524..a350164 100644 --- a/chrome/browser/ui/cocoa/view_id_util.h +++ b/chrome/browser/ui/cocoa/view_id_util.h @@ -8,8 +8,8 @@ #import <Cocoa/Cocoa.h> -#include "gfx/native_widget_types.h" #include "chrome/browser/ui/view_ids.h" +#include "ui/gfx/native_widget_types.h" // ViewIDs are a system that indexes important views in the browser window by a // ViewID identifier (integer). This is a useful compatibility for finding a |