diff options
Diffstat (limited to 'chrome/browser/extensions')
17 files changed, 27 insertions, 27 deletions
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index faa78e3..fd4b8ff 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -20,8 +20,8 @@ #include "chrome/common/extensions/extension_action.h" #include "chrome/common/url_constants.h" #include "chrome/test/ui_test_utils.h" -#include "gfx/rect.h" -#include "gfx/size.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" class BrowserActionApiTest : public ExtensionApiTest { public: diff --git a/chrome/browser/extensions/browser_action_test_util_mac.mm b/chrome/browser/extensions/browser_action_test_util_mac.mm index a21055fb..2eeeffc9 100644 --- a/chrome/browser/extensions/browser_action_test_util_mac.mm +++ b/chrome/browser/extensions/browser_action_test_util_mac.mm @@ -12,8 +12,8 @@ #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" -#include "gfx/rect.h" -#include "gfx/size.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" namespace { diff --git a/chrome/browser/extensions/browser_action_test_util_views.cc b/chrome/browser/extensions/browser_action_test_util_views.cc index 79d3f1ee..3372094 100644 --- a/chrome/browser/extensions/browser_action_test_util_views.cc +++ b/chrome/browser/extensions/browser_action_test_util_views.cc @@ -12,8 +12,8 @@ #include "chrome/browser/ui/views/toolbar_view.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" -#include "gfx/rect.h" -#include "gfx/size.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" namespace { diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index d410f2a..fe082d9 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -25,9 +25,9 @@ #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/json_value_serializer.h" #include "chrome/common/web_apps.h" -#include "gfx/codec/png_codec.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/codec/png_codec.h" namespace keys = extension_manifest_keys; diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index 6424ae7..00198be 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -21,9 +21,9 @@ #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/extensions/url_pattern.h" #include "chrome/common/web_apps.h" -#include "gfx/codec/png_codec.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/codec/png_codec.h" #include "webkit/glue/image_decoder.h" namespace { diff --git a/chrome/browser/extensions/extension_function_dispatcher.h b/chrome/browser/extensions/extension_function_dispatcher.h index 5a10b92..699382f 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.h +++ b/chrome/browser/extensions/extension_function_dispatcher.h @@ -10,8 +10,8 @@ #include <vector> #include "base/ref_counted.h" -#include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" +#include "ui/gfx/native_widget_types.h" class Browser; class Extension; diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc index e0af4fb..8709cb7 100644 --- a/chrome/browser/extensions/extension_icon_manager.cc +++ b/chrome/browser/extensions/extension_icon_manager.cc @@ -9,14 +9,14 @@ #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 "gfx/color_utils.h" -#include "gfx/favicon_size.h" -#include "gfx/skbitmap_operations.h" -#include "gfx/size.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/color_utils.h" +#include "ui/gfx/favicon_size.h" +#include "ui/gfx/size.h" +#include "ui/gfx/skbitmap_operations.h" namespace { diff --git a/chrome/browser/extensions/extension_icon_manager.h b/chrome/browser/extensions/extension_icon_manager.h index cc0deb9..e5fc381 100644 --- a/chrome/browser/extensions/extension_icon_manager.h +++ b/chrome/browser/extensions/extension_icon_manager.h @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "chrome/browser/extensions/image_loading_tracker.h" -#include "gfx/insets.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/insets.h" class Extension; diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc index 37f3453..d3c476b 100644 --- a/chrome/browser/extensions/extension_icon_manager_unittest.cc +++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc @@ -11,8 +11,8 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/json_value_serializer.h" -#include "gfx/skia_util.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/skia_util.h" // Our test class that takes care of managing the necessary threads for loading // extension icons, and waiting for those loads to happen. diff --git a/chrome/browser/extensions/extension_install_ui.h b/chrome/browser/extensions/extension_install_ui.h index 1a9b4d7..72f65db 100644 --- a/chrome/browser/extensions/extension_install_ui.h +++ b/chrome/browser/extensions/extension_install_ui.h @@ -12,8 +12,8 @@ #include "base/string16.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/common/extensions/url_pattern.h" -#include "gfx/native_widget_types.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/native_widget_types.h" class Extension; class MessageLoop; diff --git a/chrome/browser/extensions/extension_menu_manager.cc b/chrome/browser/extensions/extension_menu_manager.cc index 37fd123..aa0fa60 100644 --- a/chrome/browser/extensions/extension_menu_manager.cc +++ b/chrome/browser/extensions/extension_menu_manager.cc @@ -17,8 +17,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" -#include "gfx/favicon_size.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/favicon_size.h" #include "webkit/glue/context_menu.h" ExtensionMenuItem::ExtensionMenuItem(const Id& id, diff --git a/chrome/browser/extensions/extension_popup_api.cc b/chrome/browser/extensions/extension_popup_api.cc index 1a3fe30..0c3acb2 100644 --- a/chrome/browser/extensions/extension_popup_api.cc +++ b/chrome/browser/extensions/extension_popup_api.cc @@ -26,7 +26,7 @@ #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/common/url_constants.h" -#include "gfx/point.h" +#include "ui/gfx/point.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/bubble_border.h" diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index c3d5705..db84232 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -35,11 +35,11 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "gfx/codec/jpeg_codec.h" -#include "gfx/codec/png_codec.h" #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/codec/jpeg_codec.h" +#include "ui/gfx/codec/png_codec.h" namespace keys = extension_tabs_module_constants; diff --git a/chrome/browser/extensions/extension_uitest.cc b/chrome/browser/extensions/extension_uitest.cc index ce8d46c..e00957d 100644 --- a/chrome/browser/extensions/extension_uitest.cc +++ b/chrome/browser/extensions/extension_uitest.cc @@ -16,10 +16,10 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/ui_test.h" #include "chrome/test/ui_test_utils.h" -#include "gfx/rect.h" #include "googleurl/src/gurl.h" #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING #include "testing/gmock_mutant.h" +#include "ui/gfx/rect.h" namespace { diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 86b4e0d..087102c 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -44,9 +44,6 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "gfx/codec/png_codec.h" -#include "gfx/color_utils.h" -#include "gfx/skbitmap_operations.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -54,6 +51,9 @@ #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/codec/png_codec.h" +#include "ui/gfx/color_utils.h" +#include "ui/gfx/skbitmap_operations.h" #include "webkit/glue/image_decoder.h" namespace { diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc index 4c9734f..b0516ad 100644 --- a/chrome/browser/extensions/image_loading_tracker_unittest.cc +++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc @@ -13,9 +13,9 @@ #include "chrome/common/json_value_serializer.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" -#include "gfx/size.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/size.h" class ImageLoadingTrackerTest : public testing::Test, public ImageLoadingTracker::Observer { diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc index f153e85..31c4aff 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc @@ -27,10 +27,10 @@ #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_unpacker.h" #include "chrome/common/json_value_serializer.h" -#include "gfx/codec/png_codec.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/codec/png_codec.h" const char SandboxedExtensionUnpacker::kExtensionHeaderMagic[] = "Cr24"; |