diff options
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/browser/extension_icon_image.cc | 4 | ||||
-rw-r--r-- | extensions/browser/image_loader.h | 2 | ||||
-rw-r--r-- | extensions/browser/image_loader_unittest.cc | 2 | ||||
-rw-r--r-- | extensions/common/extension.h | 2 | ||||
-rw-r--r-- | extensions/common/manifest_handlers/icons_handler.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/extensions/browser/extension_icon_image.cc b/extensions/browser/extension_icon_image.cc index 069dc66..8e3f957 100644 --- a/extensions/browser/extension_icon_image.cc +++ b/extensions/browser/extension_icon_image.cc @@ -12,12 +12,12 @@ #include "extensions/browser/notification_types.h" #include "extensions/common/extension.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/image/canvas_image_source.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/image/image_skia_source.h" -#include "ui/gfx/size.h" -#include "ui/gfx/size_conversions.h" // The ImageSkia provided by extensions::IconImage contains ImageSkiaReps that // are computed and updated using the following algorithm (if no default icon diff --git a/extensions/browser/image_loader.h b/extensions/browser/image_loader.h index 674cd1e..4cbc927 100644 --- a/extensions/browser/image_loader.h +++ b/extensions/browser/image_loader.h @@ -14,7 +14,7 @@ #include "extensions/common/extension_resource.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/layout.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { class BrowserContext; diff --git a/extensions/browser/image_loader_unittest.cc b/extensions/browser/image_loader_unittest.cc index 7257ddc..d67ed98 100644 --- a/extensions/browser/image_loader_unittest.cc +++ b/extensions/browser/image_loader_unittest.cc @@ -22,10 +22,10 @@ #include "extensions/common/manifest_handlers/icons_handler.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_family.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/size.h" using content::BrowserThread; using content::NotificationService; diff --git a/extensions/common/extension.h b/extensions/common/extension.h index a1509da..1e1e52c 100644 --- a/extensions/common/extension.h +++ b/extensions/common/extension.h @@ -25,7 +25,7 @@ #include "extensions/common/manifest.h" #include "extensions/common/url_pattern_set.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "url/gurl.h" #if !defined(ENABLE_EXTENSIONS) diff --git a/extensions/common/manifest_handlers/icons_handler.cc b/extensions/common/manifest_handlers/icons_handler.cc index c8e01d4..8535d9b 100644 --- a/extensions/common/manifest_handlers/icons_handler.cc +++ b/extensions/common/manifest_handlers/icons_handler.cc @@ -16,7 +16,7 @@ #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handler_helpers.h" #include "grit/extensions_strings.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace extensions { |