03ee601fc1ca2f4255389957f0e1cdec3dc5734a - chromium/src
4 views
Skip to first unread message
dsand...@ucsbalum.com
Feb 21, 2022, 9:24:10 PM2/21/22
to chromium...@chromium.org
commit 03ee601fc1ca2f4255389957f0e1cdec3dc5734a
Author: David Sanders <dsand...@ucsbalum.com>
AuthorDate: Tue Feb 22 02:23:00 2022
Commit: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
CommitDate: Tue Feb 22 02:23:00 2022
Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h
Also adds includes and forward declarations to other files which
were getting them transitively, to fix the build.
Bug: 242216
Change-Id: Ib42c1b9defada322d2326584328f45890e172607
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3446451
Reviewed-by: Nico Weber <tha...@chromium.org>
Commit-Queue: Nico Weber <tha...@chromium.org>
Owners-Override: Nico Weber <tha...@chromium.org>
Cr-Commit-Position: refs/heads/main@{#973607}
diff --git a/ash/app_list/folder_image_unittest.cc b/ash/app_list/folder_image_unittest.cc
index 9278b40..c00bc2f 100644
--- a/ash/app_list/folder_image_unittest.cc
+++ b/ash/app_list/folder_image_unittest.cc
@@ -16,6 +16,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/skia_util.h"
namespace ash {
diff --git a/ash/assistant/util/resource_util.cc b/ash/assistant/util/resource_util.cc
index 11b63cf..159190b 100644
--- a/ash/assistant/util/resource_util.cc
+++ b/ash/assistant/util/resource_util.cc
@@ -9,6 +9,7 @@
#include <string>
#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "chromeos/ui/vector_icons/vector_icons.h"
diff --git a/ash/drag_drop/drag_image_view.cc b/ash/drag_drop/drag_image_view.cc
index 839dbbc..907851d 100644
--- a/ash/drag_drop/drag_image_view.cc
+++ b/ash/drag_drop/drag_image_view.cc
@@ -16,6 +16,7 @@
#include "ui/display/display.h"
#include "ui/display/screen.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/resources/grit/ui_resources.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/login/ui/horizontal_image_sequence_animation_decoder.cc b/ash/login/ui/horizontal_image_sequence_animation_decoder.cc
index b1a8a95..feeb1c1 100644
--- a/ash/login/ui/horizontal_image_sequence_animation_decoder.cc
+++ b/ash/login/ui/horizontal_image_sequence_animation_decoder.cc
@@ -4,6 +4,8 @@
#include "ash/login/ui/horizontal_image_sequence_animation_decoder.h"
+#include "ui/gfx/image/image_skia_rep.h"
+
namespace ash {
HorizontalImageSequenceAnimationDecoder::
diff --git a/ash/public/cpp/external_arc/message_center/arc_notification_item_impl.cc b/ash/public/cpp/external_arc/message_center/arc_notification_item_impl.cc
index e2958b9..7912e80 100644
--- a/ash/public/cpp/external_arc/message_center/arc_notification_item_impl.cc
+++ b/ash/public/cpp/external_arc/message_center/arc_notification_item_impl.cc
@@ -17,6 +17,7 @@
#include "base/strings/utf_string_conversions.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/message_center/public/cpp/message_center_constants.h"
#include "ui/message_center/public/cpp/notification.h"
#include "ui/message_center/public/cpp/notification_types.h"
diff --git a/ash/public/cpp/holding_space/holding_space_image.cc b/ash/public/cpp/holding_space/holding_space_image.cc
index 3653686..d0bd3a5 100644
--- a/ash/public/cpp/holding_space/holding_space_image.cc
+++ b/ash/public/cpp/holding_space/holding_space_image.cc
@@ -15,6 +15,7 @@
#include "base/location.h"
#include "chromeos/ui/base/file_icon_util.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/skia_util.h"
diff --git a/ash/public/cpp/holding_space/holding_space_image.h b/ash/public/cpp/holding_space/holding_space_image.h
index be0b747..84447d8 100644
--- a/ash/public/cpp/holding_space/holding_space_image.h
+++ b/ash/public/cpp/holding_space/holding_space_image.h
@@ -12,6 +12,7 @@
#include "base/files/file.h"
#include "base/timer/timer.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
namespace ash {
diff --git a/ash/public/cpp/holding_space/holding_space_image_unittest.cc b/ash/public/cpp/holding_space/holding_space_image_unittest.cc
index d0c36b6a..9395d6e 100644
--- a/ash/public/cpp/holding_space/holding_space_image_unittest.cc
+++ b/ash/public/cpp/holding_space/holding_space_image_unittest.cc
@@ -19,9 +19,11 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/color_palette.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_unittest_util.h"
#include "ui/gfx/paint_vector_icon.h"
diff --git a/ash/shelf/shelf_view_test_api.cc b/ash/shelf/shelf_view_test_api.cc
index 519c293a..a8be137 100644
--- a/ash/shelf/shelf_view_test_api.cc
+++ b/ash/shelf/shelf_view_test_api.cc
@@ -13,6 +13,7 @@
#include "ash/shelf/shelf_view.h"
#include "ash/shelf/shelf_widget.h"
#include "base/run_loop.h"
+#include "base/time/time.h"
#include "ui/views/animation/bounds_animator.h"
#include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/controls/separator.h"
diff --git a/ash/shelf/shelf_view_test_api.h b/ash/shelf/shelf_view_test_api.h
index 7a7b89d..5420ac3 100644
--- a/ash/shelf/shelf_view_test_api.h
+++ b/ash/shelf/shelf_view_test_api.h
@@ -6,8 +6,13 @@
#define ASH_SHELF_SHELF_VIEW_TEST_API_H_
#include "ash/public/cpp/shelf_item.h"
+#include "base/callback_forward.h"
#include "ui/base/ui_base_types.h"
+namespace base {
+class TimeDelta;
+}
+
namespace gfx {
class Point;
class Rect;
diff --git a/chrome/browser/android/tab_favicon.cc b/chrome/browser/android/tab_favicon.cc
index 0da8677..92f0436 100644
--- a/chrome/browser/android/tab_favicon.cc
+++ b/chrome/browser/android/tab_favicon.cc
@@ -13,6 +13,7 @@
#include "ui/gfx/android/java_bitmap.h"
#include "ui/gfx/favicon_size.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using base::android::JavaParamRef;
using base::android::ScopedJavaLocalRef;
diff --git a/chrome/browser/apps/icon_standardizer.cc b/chrome/browser/apps/icon_standardizer.cc
index ba18f44..15fde45 100644
--- a/chrome/browser/apps/icon_standardizer.cc
+++ b/chrome/browser/apps/icon_standardizer.cc
@@ -6,6 +6,7 @@
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace apps {
diff --git a/chrome/browser/apps/icon_standardizer_unittest.cc b/chrome/browser/apps/icon_standardizer_unittest.cc
index 22443bc..e1dd7ce 100644
--- a/chrome/browser/apps/icon_standardizer_unittest.cc
+++ b/chrome/browser/apps/icon_standardizer_unittest.cc
@@ -5,6 +5,8 @@
#include "chrome/browser/apps/icon_standardizer.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkImage.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
diff --git a/chrome/browser/ash/accessibility/magnification_manager.cc b/chrome/browser/ash/accessibility/magnification_manager.cc
index 76ead7f..2d662a7 100644
--- a/chrome/browser/ash/accessibility/magnification_manager.cc
+++ b/chrome/browser/ash/accessibility/magnification_manager.cc
@@ -21,6 +21,8 @@
#include "content/public/browser/focused_node_details.h"
#include "ui/accessibility/accessibility_features.h"
#include "ui/accessibility/ax_role_properties.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/views/accessibility/ax_event_manager.h"
#include "ui/views/accessibility/view_accessibility.h"
diff --git a/chrome/browser/ash/accessibility/magnification_manager.h b/chrome/browser/ash/accessibility/magnification_manager.h
index c364e1f..3f46c22 100644
--- a/chrome/browser/ash/accessibility/magnification_manager.h
+++ b/chrome/browser/ash/accessibility/magnification_manager.h
@@ -8,6 +8,7 @@
#include "ash/public/cpp/accessibility_controller_enums.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
+#include "base/time/time.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_observer.h"
#include "components/session_manager/core/session_manager.h"
@@ -18,6 +19,11 @@
class PrefChangeRegistrar;
+namespace gfx {
+class Point;
+class Rect;
+}
+
namespace ash {
// MagnificationManager controls the Fullscreen and Docked magnifier from
diff --git a/chrome/browser/ash/login/session/user_session_initializer.h b/chrome/browser/ash/login/session/user_session_initializer.h
index 02c9bb9..1c007d80 100644
--- a/chrome/browser/ash/login/session/user_session_initializer.h
+++ b/chrome/browser/ash/login/session/user_session_initializer.h
@@ -7,6 +7,8 @@
#include <memory>
+#include "base/callback.h"
+#include "base/time/time.h"
#include "components/session_manager/core/session_manager_observer.h"
#include "components/user_manager/user.h"
diff --git a/chrome/browser/chromeos/arc/open_with_menu_unittest.cc b/chrome/browser/chromeos/arc/open_with_menu_unittest.cc
index 485b389..7e01c7e 100644
--- a/chrome/browser/chromeos/arc/open_with_menu_unittest.cc
+++ b/chrome/browser/chromeos/arc/open_with_menu_unittest.cc
@@ -21,6 +21,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace arc {
diff --git a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
index 9cf450a..d03f671 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
@@ -16,6 +16,7 @@
#include "content/public/browser/browser_thread.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/codec/jpeg_codec.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/image/image_skia_operations.h"
using content::BrowserThread;
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
index 7ac039c..b50c80a 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -73,6 +73,7 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using content::BrowserContext;
using content::BrowserThread;
diff --git a/chrome/browser/extensions/chrome_app_icon_unittest.cc b/chrome/browser/extensions/chrome_app_icon_unittest.cc
index 3b53213..122d0318 100644
--- a/chrome/browser/extensions/chrome_app_icon_unittest.cc
+++ b/chrome/browser/extensions/chrome_app_icon_unittest.cc
@@ -23,6 +23,7 @@
#include "extensions/common/constants.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_unittest_util.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
index 59c0f627..5b90910 100644
--- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
+++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
@@ -32,6 +32,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/skia_util.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/extensions/extension_action_storage_manager.cc b/chrome/browser/extensions/extension_action_storage_manager.cc
index 939d96a8..29e2286f 100644
--- a/chrome/browser/extensions/extension_action_storage_manager.cc
+++ b/chrome/browser/extensions/extension_action_storage_manager.cc
@@ -22,6 +22,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace extensions {
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index 1d9c37e..0340ad1 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -40,6 +40,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_types.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using extensions::Extension;
using extensions::Manifest;
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index ac1d111..d01c32bd 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -48,6 +48,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/favicon_size.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using content::WebContents;
using extensions::Extension;
diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h
index 57cfc64..03af516 100644
--- a/chrome/browser/media/webrtc/desktop_media_list.h
+++ b/chrome/browser/media/webrtc/desktop_media_list.h
@@ -8,8 +8,10 @@
#include <string>
#include <vector>
+#include "base/callback_forward.h"
#include "base/time/time.h"
#include "content/public/browser/desktop_media_id.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/gfx/image/image_skia.h"
class DesktopMediaListObserver;
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h
index c56bc6d..9c77a2d5 100644
--- a/chrome/browser/media/webrtc/desktop_media_list_base.h
+++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
@@ -5,10 +5,12 @@
#ifndef CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_BASE_H_
#define CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_BASE_H_
+#include "base/callback.h"
#include "base/memory/raw_ptr.h"
#include "chrome/browser/media/webrtc/desktop_media_list.h"
#include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
#include "content/public/browser/desktop_media_id.h"
+#include "ui/gfx/geometry/size.h"
namespace gfx {
class Image;
diff --git a/chrome/browser/media/webrtc/fake_desktop_media_list.cc b/chrome/browser/media/webrtc/fake_desktop_media_list.cc
index b1db454..87f2e8d 100644
--- a/chrome/browser/media/webrtc/fake_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/fake_desktop_media_list.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/callback.h"
#include "base/strings/string_number_conversions.h"
#include "chrome/browser/media/webrtc/desktop_media_list.h"
#include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
diff --git a/chrome/browser/notifications/platform_notification_service_unittest.cc b/chrome/browser/notifications/platform_notification_service_unittest.cc
index 82c751a6..84a27f0 100644
--- a/chrome/browser/notifications/platform_notification_service_unittest.cc
+++ b/chrome/browser/notifications/platform_notification_service_unittest.cc
@@ -40,6 +40,7 @@
#include "third_party/blink/public/mojom/notifications/notification.mojom.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "url/gurl.h"
#if BUILDFLAG(ENABLE_EXTENSIONS)
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index 4e799ba..67bd3bfb 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -55,6 +55,7 @@
#include "ui/base/models/tree_node_iterator.h"
#include "ui/gfx/favicon_size.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using bookmarks::BookmarkModel;
using bookmarks::BookmarkNode;
diff --git a/chrome/browser/task_manager/providers/worker_task.cc b/chrome/browser/task_manager/providers/worker_task.cc
index a15cb07..54aa38a 100644
--- a/chrome/browser/task_manager/providers/worker_task.cc
+++ b/chrome/browser/task_manager/providers/worker_task.cc
@@ -6,6 +6,7 @@
#include <string>
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/taskbar/taskbar_decorator_win.cc b/chrome/browser/taskbar/taskbar_decorator_win.cc
index 240b0fd..5066f716 100644
--- a/chrome/browser/taskbar/taskbar_decorator_win.cc
+++ b/chrome/browser/taskbar/taskbar_decorator_win.cc
@@ -32,6 +32,7 @@
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkFont.h"
+#include "third_party/skia/include/core/SkImage.h"
#include "third_party/skia/include/core/SkImageEncoder.h"
#include "third_party/skia/include/core/SkImageInfo.h"
#include "third_party/skia/include/core/SkRRect.h"
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index 7e20e91..2a16c7cf 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -53,6 +53,7 @@
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
using content::BrowserThread;
using extensions::Extension;
diff --git a/chrome/browser/ui/app_list/DEPS b/chrome/browser/ui/app_list/DEPS
index fac7ee0..05680e7 100644
--- a/chrome/browser/ui/app_list/DEPS
+++ b/chrome/browser/ui/app_list/DEPS
@@ -21,4 +21,8 @@
"+ash/app_list/views/apps_grid_view.h",
"+ash/shell.h",
],
+
+ "app_list_syncable_service_unittest\.cc": [
+ "+cc/base/math_util.h",
+ ],
}
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc b/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
index 7edbded..4e14a958 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
@@ -17,6 +17,7 @@
#include "base/test/scoped_command_line.h"
#include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
+#include "cc/base/math_util.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/app_list/app_list_client_impl.h"
diff --git a/chrome/browser/ui/app_list/arc/arc_app_icon.h b/chrome/browser/ui/app_list/arc/arc_app_icon.h
index 2f165ad..231a830 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_icon.h
+++ b/chrome/browser/ui/app_list/arc/arc_app_icon.h
@@ -12,6 +12,7 @@
#include <vector>
#include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
#include "ui/base/layout.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
diff --git a/chrome/browser/ui/app_list/md_icon_normalizer.cc b/chrome/browser/ui/app_list/md_icon_normalizer.cc
index 4fccbf7..40d5a07 100644
--- a/chrome/browser/ui/app_list/md_icon_normalizer.cc
+++ b/chrome/browser/ui/app_list/md_icon_normalizer.cc
@@ -15,6 +15,7 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
// The implementation is copied and adapted from the Android Launcher.
// See com.android.launcher3.graphics.IconNormalizer.java in the Android source.
diff --git a/chrome/browser/ui/app_list/search/app_search_provider.h b/chrome/browser/ui/app_list/search/app_search_provider.h
index ff6871c..8a00202 100644
--- a/chrome/browser/ui/app_list/search/app_search_provider.h
+++ b/chrome/browser/ui/app_list/search/app_search_provider.h
@@ -11,6 +11,7 @@
#include "base/containers/flat_map.h"
#include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
#include "chrome/browser/ui/app_list/search/search_provider.h"
class AppListControllerDelegate;
diff --git a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h
index 3efe593..f0f7e35 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h
+++ b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h
@@ -18,6 +18,10 @@
enum class ArcPlayStoreSearchRequestState;
} // namespace arc
+namespace base {
+class TimeTicks;
+} // namespace base
+
namespace app_list {
class ArcPlayStoreSearchProvider : public SearchProvider {
diff --git a/chrome/browser/ui/app_list/search/common/url_icon_source.cc b/chrome/browser/ui/app_list/search/common/url_icon_source.cc
index 69a770d..349db2a 100644
--- a/chrome/browser/ui/app_list/search/common/url_icon_source.cc
+++ b/chrome/browser/ui/app_list/search/common/url_icon_source.cc
@@ -18,6 +18,7 @@
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
using content::BrowserThread;
diff --git a/chrome/browser/ui/app_list/search/search_controller.h b/chrome/browser/ui/app_list/search/search_controller.h
index 46ab832..c5bd10b 100644
--- a/chrome/browser/ui/app_list/search/search_controller.h
+++ b/chrome/browser/ui/app_list/search/search_controller.h
@@ -27,6 +27,11 @@
enum class AppListSearchResultType;
}
+namespace base {
+class Time;
+class TimeDelta;
+}
+
namespace app_list {
class SearchProvider;
diff --git a/chrome/browser/ui/app_list/search/search_controller_impl.h b/chrome/browser/ui/app_list/search/search_controller_impl.h
index 557ab3b..2c1ddef 100644
--- a/chrome/browser/ui/app_list/search/search_controller_impl.h
+++ b/chrome/browser/ui/app_list/search/search_controller_impl.h
@@ -14,6 +14,7 @@
#include "base/callback.h"
#include "base/observer_list.h"
+#include "base/time/time.h"
#include "chrome/browser/ui/app_list/search/mixer.h"
#include "chrome/browser/ui/app_list/search/ranking/launch_data.h"
#include "chrome/browser/ui/app_list/search/search_controller.h"
diff --git a/chrome/browser/ui/ash/app_icon_color_cache.cc b/chrome/browser/ui/ash/app_icon_color_cache.cc
index 91419f2..7b4587699 100644
--- a/chrome/browser/ui/ash/app_icon_color_cache.cc
+++ b/chrome/browser/ui/ash/app_icon_color_cache.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/ui/ash/app_icon_color_cache.h"
+#include "base/callback.h"
#include "base/no_destructor.h"
#include "ui/gfx/color_analysis.h"
#include "ui/gfx/image/image_skia.h"
diff --git a/chrome/browser/ui/ash/clipboard_image_model_request.cc b/chrome/browser/ui/ash/clipboard_image_model_request.cc
index 204bdd8..628b08d 100644
--- a/chrome/browser/ui/ash/clipboard_image_model_request.cc
+++ b/chrome/browser/ui/ash/clipboard_image_model_request.cc
@@ -23,6 +23,7 @@
#include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/views/controls/webview/webview.h"
#include "ui/views/widget/widget.h"
#include "url/gurl.h"
diff --git a/chrome/browser/ui/ash/test_session_controller.cc b/chrome/browser/ui/ash/test_session_controller.cc
index c833212..3eb27c80 100644
--- a/chrome/browser/ui/ash/test_session_controller.cc
+++ b/chrome/browser/ui/ash/test_session_controller.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "ash/public/cpp/session/session_observer.h"
+#include "base/callback.h"
TestSessionController::TestSessionController() = default;
TestSessionController::~TestSessionController() = default;
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc
index 128a113..5212adab 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
@@ -44,6 +44,7 @@
#include "ui/color/color_provider.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/scoped_canvas.h"
diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
index 8da2c38..898bb77 100644
--- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
+++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
@@ -22,6 +22,7 @@
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/render_text.h"
#include "ui/gfx/shadow_value.h"
#include "ui/gfx/skia_paint_util.h"
diff --git a/chrome/browser/ui/test/test_app_window_icon_observer.cc b/chrome/browser/ui/test/test_app_window_icon_observer.cc
index ab4db20e..9c74699 100644
--- a/chrome/browser/ui/test/test_app_window_icon_observer.cc
+++ b/chrome/browser/ui/test/test_app_window_icon_observer.cc
@@ -11,6 +11,7 @@
#include "extensions/browser/app_window/app_window.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_unittest_util.h"
TestAppWindowIconObserver::TestAppWindowIconObserver(
diff --git a/chrome/browser/ui/thumbnails/thumbnail_image.h b/chrome/browser/ui/thumbnails/thumbnail_image.h
index ee85b0c..24a8753 100644
--- a/chrome/browser/ui/thumbnails/thumbnail_image.h
+++ b/chrome/browser/ui/thumbnails/thumbnail_image.h
@@ -17,6 +17,7 @@
#include "base/sequence_checker.h"
#include "base/token.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
namespace base {
diff --git a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc
index 1b599a4..3b6c065c 100644
--- a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc
+++ b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc
@@ -35,6 +35,7 @@
#include "ui/events/event.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/native_theme/native_theme.h"
#include "ui/resources/grit/ui_resources.h"
diff --git a/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc b/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc
index 6f832a40..cbef196 100644
--- a/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc
+++ b/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc
@@ -21,6 +21,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/metadata/metadata_impl_macros.h"
#include "ui/base/webui/web_ui_util.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/resources/grit/ui_resources.h"
#include "ui/views/border.h"
#include "ui/views/controls/button/label_button.h"
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
index c0f9786..3ec9fd4 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
+++ b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
@@ -11,6 +11,7 @@
#include "base/memory/scoped_refptr.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/browser/ui/views/status_icons/status_icon_button_linux.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/message_center/public/cpp/notifier_id.h"
#if defined(USE_DBUS)
diff --git a/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc b/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc
index 321b1d8..a1e6202 100644
--- a/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/views/web_apps/web_app_info_image_source.h"
-#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
WebAppInfoImageSource::WebAppInfoImageSource(
int dip_size,
diff --git a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc
index 43233c9..0e3578e 100644
--- a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc
@@ -48,6 +48,7 @@
#include "ui/base/ui_base_features.h"
#include "ui/events/event.h"
#include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_chromeos.cc b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_chromeos.cc
index 1082399..39b835ae 100644
--- a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_chromeos.cc
+++ b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_chromeos.cc
@@ -29,6 +29,7 @@
#include "ui/base/webui/web_ui_util.h"
#include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc
index 7289a4f..516353b 100644
--- a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc
+++ b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc
@@ -31,6 +31,7 @@
#include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_unittest_util.h"
using testing::_;
diff --git a/chrome/browser/ui/webui/chromeos/user_image_source.cc b/chrome/browser/ui/webui/chromeos/user_image_source.cc
index 981abd6..1d7af66 100644
--- a/chrome/browser/ui/webui/chromeos/user_image_source.cc
+++ b/chrome/browser/ui/webui/chromeos/user_image_source.cc
@@ -18,6 +18,7 @@
#include "ui/display/display.h"
#include "ui/display/screen.h"
#include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "url/third_party/mozilla/url_parse.h"
namespace chromeos {
diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc
index c489d37..dfe7f2a6 100644
--- a/chrome/browser/ui/webui/fileicon_source.cc
+++ b/chrome/browser/ui/webui/fileicon_source.cc
@@ -19,6 +19,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "url/gurl.h"
namespace {
diff --git a/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc b/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc
index f72dba3..9bde33c 100644
--- a/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc
@@ -37,6 +37,7 @@
#include "ui/base/webui/web_ui_util.h"
#include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace chromeos {
namespace settings {
diff --git a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc
index b7ef1f6..8135116 100644
--- a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc
@@ -28,6 +28,7 @@
#include "ui/base/webui/web_ui_util.h"
#include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace chromeos {
namespace settings {
diff --git a/chrome/browser/ui/webui/util/image_util.cc b/chrome/browser/ui/webui/util/image_util.cc
index e8ec406..b5ae8972 100644
--- a/chrome/browser/ui/webui/util/image_util.cc
+++ b/chrome/browser/ui/webui/util/image_util.cc
@@ -8,6 +8,7 @@
#include "third_party/skia/include/core/SkStream.h"
#include "ui/gfx/image/buffer_w_stream.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace webui {
diff --git a/chrome/browser/web_applications/test/web_app_icon_test_utils.cc b/chrome/browser/web_applications/test/web_app_icon_test_utils.cc
index 1345865c..456e29d 100644
--- a/chrome/browser/web_applications/test/web_app_icon_test_utils.cc
+++ b/chrome/browser/web_applications/test/web_app_icon_test_utils.cc
@@ -21,6 +21,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "url/gurl.h"
namespace web_app {
diff --git a/chrome/browser/web_applications/web_app_icon_generator.cc b/chrome/browser/web_applications/web_app_icon_generator.cc
index 5f374fa..e61cdbf 100644
--- a/chrome/browser/web_applications/web_app_icon_generator.cc
+++ b/chrome/browser/web_applications/web_app_icon_generator.cc
@@ -26,6 +26,7 @@
#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_rep.h"
namespace web_app {
diff --git a/chrome/browser/web_applications/web_app_icon_generator_unittest.cc b/chrome/browser/web_applications/web_app_icon_generator_unittest.cc
index a774ebe..f29d4a1 100644
--- a/chrome/browser/web_applications/web_app_icon_generator_unittest.cc
+++ b/chrome/browser/web_applications/web_app_icon_generator_unittest.cc
@@ -16,6 +16,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/color_utils.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace web_app {
diff --git a/chrome/browser/web_applications/web_app_icon_manager.cc b/chrome/browser/web_applications/web_app_icon_manager.cc
index 31b536e..ed126df7 100644
--- a/chrome/browser/web_applications/web_app_icon_manager.cc
+++ b/chrome/browser/web_applications/web_app_icon_manager.cc
@@ -34,6 +34,7 @@
#include "ui/base/layout.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/favicon_size.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace web_app {
diff --git a/components/arc/common/intent_helper/activity_icon_loader.cc b/components/arc/common/intent_helper/activity_icon_loader.cc
index 4eb11b5..d61aa05 100644
--- a/components/arc/common/intent_helper/activity_icon_loader.cc
+++ b/components/arc/common/intent_helper/activity_icon_loader.cc
@@ -19,6 +19,7 @@
#include "ui/base/layout.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/components/arc/arc_util.h"
diff --git a/components/arc/common/intent_helper/activity_icon_loader_unittest.cc b/components/arc/common/intent_helper/activity_icon_loader_unittest.cc
index 0f44cb5..c6738d4 100644
--- a/components/arc/common/intent_helper/activity_icon_loader_unittest.cc
+++ b/components/arc/common/intent_helper/activity_icon_loader_unittest.cc
@@ -15,6 +15,7 @@
#include "components/arc/common/intent_helper/adaptive_icon_delegate.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace arc {
namespace internal {
diff --git a/components/favicon_base/favicon_util.cc b/components/favicon_base/favicon_util.cc
index c179615c..5834055 100644
--- a/components/favicon_base/favicon_util.cc
+++ b/components/favicon_base/favicon_util.cc
@@ -23,6 +23,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_png_rep.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#if BUILDFLAG(IS_MAC)
#include "base/mac/mac_util.h"
diff --git a/components/favicon_base/select_favicon_frames.cc b/components/favicon_base/select_favicon_frames.cc
index e4e9a13..bc40836 100644
--- a/components/favicon_base/select_favicon_frames.cc
+++ b/components/favicon_base/select_favicon_frames.cc
@@ -20,6 +20,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
namespace {
diff --git a/components/favicon_base/select_favicon_frames_unittest.cc b/components/favicon_base/select_favicon_frames_unittest.cc
index 6d0bc46e..a45614e 100644
--- a/components/favicon_base/select_favicon_frames_unittest.cc
+++ b/components/favicon_base/select_favicon_frames_unittest.cc
@@ -12,7 +12,9 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/layout.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using std::vector;
diff --git a/components/media_message_center/media_notification_background_ash_impl.cc b/components/media_message_center/media_notification_background_ash_impl.cc
index 221e9b3..2142b4f5 100644
--- a/components/media_message_center/media_notification_background_ash_impl.cc
+++ b/components/media_message_center/media_notification_background_ash_impl.cc
@@ -6,6 +6,7 @@
#include "base/i18n/rtl.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/views/view.h"
diff --git a/components/media_message_center/media_notification_background_ash_impl.h b/components/media_message_center/media_notification_background_ash_impl.h
index 02c8d7a..217885d 100644
--- a/components/media_message_center/media_notification_background_ash_impl.h
+++ b/components/media_message_center/media_notification_background_ash_impl.h
@@ -10,6 +10,10 @@
#include "base/component_export.h"
#include "ui/gfx/image/image_skia.h"
+namespace gfx {
+class Rect;
+}
+
namespace media_message_center {
// MediaNotificationBackground for CrOS media notifications.
diff --git a/components/media_message_center/media_notification_background_ash_impl_unittest.cc b/components/media_message_center/media_notification_background_ash_impl_unittest.cc
index 25e553e..bfc22ba 100644
--- a/components/media_message_center/media_notification_background_ash_impl_unittest.cc
+++ b/components/media_message_center/media_notification_background_ash_impl_unittest.cc
@@ -6,6 +6,7 @@
#include "base/i18n/rtl.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/geometry/rect.h"
namespace media_message_center {
diff --git a/extensions/browser/extension_action.cc b/extensions/browser/extension_action.cc
index b33485a..d186794 100644
--- a/extensions/browser/extension_action.cc
+++ b/extensions/browser/extension_action.cc
@@ -31,6 +31,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/skbitmap_operations.h"
#include "url/gurl.h"
diff --git a/extensions/browser/extension_icon_image.cc b/extensions/browser/extension_icon_image.cc
index 04c7e6e..f18c0a8 100644
--- a/extensions/browser/extension_icon_image.cc
+++ b/extensions/browser/extension_icon_image.cc
@@ -19,6 +19,7 @@
#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_rep.h"
#include "ui/gfx/image/image_skia_source.h"
// The ImageSkia provided by extensions::IconImage contains ImageSkiaReps that
diff --git a/extensions/browser/extension_icon_image_unittest.cc b/extensions/browser/extension_icon_image_unittest.cc
index 7dab4f9..bca8511 100644
--- a/extensions/browser/extension_icon_image_unittest.cc
+++ b/extensions/browser/extension_icon_image_unittest.cc
@@ -20,6 +20,7 @@
#include "skia/ext/image_operations.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/skia_util.h"
diff --git a/extensions/browser/image_loader.cc b/extensions/browser/image_loader.cc
index c738684c..d8490d37 100644
--- a/extensions/browser/image_loader.cc
+++ b/extensions/browser/image_loader.cc
@@ -31,6 +31,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_family.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using content::BrowserThread;
diff --git a/extensions/browser/image_loader_unittest.cc b/extensions/browser/image_loader_unittest.cc
index e29a635..d277504 100644
--- a/extensions/browser/image_loader_unittest.cc
+++ b/extensions/browser/image_loader_unittest.cc
@@ -31,6 +31,7 @@
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_family.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using extensions::mojom::ManifestLocation;
diff --git a/ui/aura/cursor/cursor_util.cc b/ui/aura/cursor/cursor_util.cc
index 74d41143..c3660ee 100644
--- a/ui/aura/cursor/cursor_util.cc
+++ b/ui/aura/cursor/cursor_util.cc
@@ -14,6 +14,7 @@
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/skbitmap_operations.h"
namespace aura {
diff --git a/ui/aura/cursor/cursors_aura.cc b/ui/aura/cursor/cursors_aura.cc
index 5510d96..ad4e257 100644
--- a/ui/aura/cursor/cursors_aura.cc
+++ b/ui/aura/cursor/cursors_aura.cc
@@ -15,6 +15,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/resources/grit/ui_resources.h"
#if BUILDFLAG(IS_WIN)
diff --git a/ui/base/dragdrop/os_exchange_data_provider.h b/ui/base/dragdrop/os_exchange_data_provider.h
index a8f1141..5fad161 100644
--- a/ui/base/dragdrop/os_exchange_data_provider.h
+++ b/ui/base/dragdrop/os_exchange_data_provider.h
@@ -19,6 +19,10 @@
#include "ui/base/dragdrop/download_file_interface.h"
#include "url/gurl.h"
+#if BUILDFLAG(IS_WIN)
+#include "base/callback_forward.h"
+#endif
+
#if defined(USE_AURA) || BUILDFLAG(IS_APPLE)
#include "ui/gfx/geometry/vector2d.h"
#include "ui/gfx/image/image_skia.h"
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
index 4d7b2f1..8cabb84 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -39,6 +39,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/l10n/l10n_util_win.h"
#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/skbitmap_operations.h"
#include "ui/strings/grit/ui_strings.h"
diff --git a/ui/base/models/image_model.h b/ui/base/models/image_model.h
index 916e94f..47fee6d 100644
--- a/ui/base/models/image_model.h
+++ b/ui/base/models/image_model.h
@@ -11,6 +11,7 @@
#include "third_party/skia/include/core/SkColor.h"
#include "ui/color/color_id.h"
#include "ui/gfx/color_palette.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index fff568d..cce05971 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -47,6 +47,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/strings/grit/app_locale_settings.h"
#include "url/gurl.h"
diff --git a/ui/base/x/x11_desktop_window_move_client.cc b/ui/base/x/x11_desktop_window_move_client.cc
index c420f52..f7ae333 100644
--- a/ui/base/x/x11_desktop_window_move_client.cc
+++ b/ui/base/x/x11_desktop_window_move_client.cc
@@ -6,6 +6,7 @@
#include "ui/base/x/x11_util.h"
#include "ui/events/event.h"
+#include "ui/gfx/geometry/rect.h"
namespace ui {
diff --git a/ui/base/x/x11_desktop_window_move_client.h b/ui/base/x/x11_desktop_window_move_client.h
index c17a278..9ec14ee 100644
--- a/ui/base/x/x11_desktop_window_move_client.h
+++ b/ui/base/x/x11_desktop_window_move_client.h
@@ -11,6 +11,10 @@
#include "ui/base/x/x11_whole_screen_move_loop.h"
#include "ui/gfx/geometry/point.h"
+namespace gfx {
+class Rect;
+}
+
namespace ui {
// When we're dragging tabs, we need to manually position our window.
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index c4976a7..2f885194 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -43,6 +43,7 @@
#include "ui/gfx/geometry/rounded_corners_f.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/geometry/transform.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/interpolated_transform.h"
namespace ui {
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index 24042be..26805d2 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -26,6 +26,7 @@
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/geometry/transform.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/scoped_canvas.h"
#include "ui/gfx/skia_paint_util.h"
#include "ui/gfx/switches.h"
diff --git a/ui/gfx/image/canvas_image_source.cc b/ui/gfx/image/canvas_image_source.cc
index 13274ed..dead051 100644
--- a/ui/gfx/image/canvas_image_source.cc
+++ b/ui/gfx/image/canvas_image_source.cc
@@ -11,6 +11,7 @@
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/switches.h"
namespace gfx {
diff --git a/ui/gfx/image/image_family_unittest.cc b/ui/gfx/image/image_family_unittest.cc
index 4bd2dc6..0e38547 100644
--- a/ui/gfx/image/image_family_unittest.cc
+++ b/ui/gfx/image/image_family_unittest.cc
@@ -5,6 +5,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkImageInfo.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"
diff --git a/ui/gfx/image/image_generic.cc b/ui/gfx/image/image_generic.cc
index f598390..25849fc 100644
--- a/ui/gfx/image/image_generic.cc
+++ b/ui/gfx/image/image_generic.cc
@@ -10,6 +10,7 @@
#include "base/logging.h"
#include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
namespace gfx {
diff --git a/ui/gfx/image/image_ios.mm b/ui/gfx/image/image_ios.mm
index 17b6b92..130f11e 100644
--- a/ui/gfx/image/image_ios.mm
+++ b/ui/gfx/image/image_ios.mm
@@ -17,6 +17,7 @@
#include "ui/gfx/image/image_internal.h"
#include "ui/gfx/image/image_png_rep.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_util_ios.h"
namespace {
diff --git a/ui/gfx/image/image_mac_unittest.mm b/ui/gfx/image/image_mac_unittest.mm
index d0fff04..b37bcac 100644
--- a/ui/gfx/image/image_mac_unittest.mm
+++ b/ui/gfx/image/image_mac_unittest.mm
@@ -10,6 +10,7 @@
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_png_rep.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_util_mac.h"
#include "ui/gfx/image/image_unittest_util.h"
diff --git a/ui/gfx/image/image_skia.cc b/ui/gfx/image/image_skia.cc
index 05971d1..27dbf9b 100644
--- a/ui/gfx/image/image_skia.cc
+++ b/ui/gfx/image/image_skia.cc
@@ -22,6 +22,7 @@
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/switches.h"
diff --git a/ui/gfx/image/image_skia.h b/ui/gfx/image/image_skia.h
index 60cc102..a8cf256 100644
--- a/ui/gfx/image/image_skia.h
+++ b/ui/gfx/image/image_skia.h
@@ -10,10 +10,11 @@
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
+#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/gfx_export.h"
-#include "ui/gfx/image/image_skia_rep.h"
namespace gfx {
+class ImageSkiaRep;
class ImageSkiaSource;
class Size;
diff --git a/ui/gfx/image/image_skia_operations_unittest.cc b/ui/gfx/image/image_skia_operations_unittest.cc
index 473e2d5..b7e1052d 100644
--- a/ui/gfx/image/image_skia_operations_unittest.cc
+++ b/ui/gfx/image/image_skia_operations_unittest.cc
@@ -5,7 +5,9 @@
#include "ui/gfx/image/image_skia_operations.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace gfx {
namespace {
diff --git a/ui/gfx/image/image_skia_util_ios.mm b/ui/gfx/image/image_skia_util_ios.mm
index 4ecbfdc..7cc5814 100644
--- a/ui/gfx/image/image_skia_util_ios.mm
+++ b/ui/gfx/image/image_skia_util_ios.mm
@@ -10,6 +10,7 @@
#include "skia/ext/skia_utils_ios.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace gfx {
diff --git a/ui/gfx/image/image_skia_util_mac.mm b/ui/gfx/image/image_skia_util_mac.mm
index 35b3845..49b3c726 100644
--- a/ui/gfx/image/image_skia_util_mac.mm
+++ b/ui/gfx/image/image_skia_util_mac.mm
@@ -16,6 +16,7 @@
#include "skia/ext/skia_utils_mac.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace {
diff --git a/ui/gfx/image/image_unittest.cc b/ui/gfx/image/image_unittest.cc
index 81f050c..166efeb9 100644
--- a/ui/gfx/image/image_unittest.cc
+++ b/ui/gfx/image/image_unittest.cc
@@ -10,9 +10,11 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPaint.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_png_rep.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_unittest_util.h"
#if BUILDFLAG(IS_IOS)
diff --git a/ui/gfx/image/image_unittest_util.cc b/ui/gfx/image/image_unittest_util.cc
index f9458f81..2da64db 100644
--- a/ui/gfx/image/image_unittest_util.cc
+++ b/ui/gfx/image/image_unittest_util.cc
@@ -17,6 +17,7 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#if BUILDFLAG(IS_IOS)
#include "base/mac/scoped_cftyperef.h"
diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc
index 893c037a..63305ce 100644
--- a/ui/gfx/image/image_util.cc
+++ b/ui/gfx/image/image_util.cc
@@ -17,6 +17,7 @@
#include "ui/gfx/codec/webp_codec.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/resize_image_dimensions.h"
namespace {
diff --git a/ui/gfx/nine_image_painter.cc b/ui/gfx/nine_image_painter.cc
index b2292b3f..f183b27 100644
--- a/ui/gfx/nine_image_painter.cc
+++ b/ui/gfx/nine_image_painter.cc
@@ -19,6 +19,7 @@
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/scoped_canvas.h"
namespace gfx {
diff --git a/ui/gfx/nine_image_painter_unittest.cc b/ui/gfx/nine_image_painter_unittest.cc
index 9897d00..be755f5 100644
--- a/ui/gfx/nine_image_painter_unittest.cc
+++ b/ui/gfx/nine_image_painter_unittest.cc
@@ -13,6 +13,7 @@
#include "ui/gfx/geometry/vector2d.h"
#include "ui/gfx/geometry/vector2d_conversions.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace gfx {
diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc
index 5b6f81b..74a3edf5 100644
--- a/ui/gtk/gtk_ui.cc
+++ b/ui/gtk/gtk_ui.cc
@@ -47,6 +47,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/skbitmap_operations.h"
#include "ui/gtk/gtk_compat.h"
diff --git a/ui/gtk/nav_button_provider_gtk.cc b/ui/gtk/nav_button_provider_gtk.cc
index 27239539..8d1529f 100644
--- a/ui/gtk/nav_button_provider_gtk.cc
+++ b/ui/gtk/nav_button_provider_gtk.cc
@@ -8,6 +8,7 @@
#include "ui/base/glib/glib_cast.h"
#include "ui/base/glib/scoped_gobject.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gtk/gtk_compat.h"
#include "ui/gtk/gtk_util.h"
diff --git a/ui/ozone/platform/wayland/host/wayland_surface.cc b/ui/ozone/platform/wayland/host/wayland_surface.cc
index 9a4c7a51..b9c2a12 100644
--- a/ui/ozone/platform/wayland/host/wayland_surface.cc
+++ b/ui/ozone/platform/wayland/host/wayland_surface.cc
@@ -18,6 +18,7 @@
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/geometry/size_f.h"
+#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/ozone/platform/wayland/common/wayland_util.h"
#include "ui/ozone/platform/wayland/host/overlay_prioritizer.h"
diff --git a/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc b/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
index 87d7814..cd9a52c 100644
--- a/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
+++ b/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
@@ -16,6 +16,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/geometry/rounded_corners_f.h"
#include "ui/gfx/geometry/rrect_f.h"
+#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/gpu_fence_handle.h"
#include "ui/gfx/linux/drm_util_linux.h"
#include "ui/gfx/overlay_priority_hint.h"
diff --git a/ui/ozone/platform/x11/test/x11_drag_drop_client_unittest.cc b/ui/ozone/platform/x11/test/x11_drag_drop_client_unittest.cc
index e4e915b8..6b66749 100644
--- a/ui/ozone/platform/x11/test/x11_drag_drop_client_unittest.cc
+++ b/ui/ozone/platform/x11/test/x11_drag_drop_client_unittest.cc
@@ -19,6 +19,7 @@
#include "base/test/task_environment.h"
#include "base/threading/thread_task_runner_handle.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkPath.h"
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/dragdrop/mojom/drag_drop_types.mojom-shared.h"
#include "ui/base/dragdrop/os_exchange_data.h"
diff --git a/ui/ozone/platform/x11/x11_topmost_window_finder_interactive_uitest.cc b/ui/ozone/platform/x11/x11_topmost_window_finder_interactive_uitest.cc
index 346a45e..b0b60f6 100644
--- a/ui/ozone/platform/x11/x11_topmost_window_finder_interactive_uitest.cc
+++ b/ui/ozone/platform/x11/x11_topmost_window_finder_interactive_uitest.cc
@@ -19,6 +19,7 @@
#include "ui/base/x/test/x11_property_change_waiter.h"
#include "ui/base/x/x11_util.h"
#include "ui/events/platform/x11/x11_event_source.h"
+#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/x/connection.h"
#include "ui/gfx/x/event.h"
diff --git a/ui/ozone/platform/x11/x11_window.cc b/ui/ozone/platform/x11/x11_window.cc
index 15b5f6f..8e096dc 100644
--- a/ui/ozone/platform/x11/x11_window.cc
+++ b/ui/ozone/platform/x11/x11_window.cc
@@ -34,6 +34,7 @@
#include "ui/events/x/events_x_utils.h"
#include "ui/events/x/x11_event_translation.h"
#include "ui/gfx/geometry/skia_conversions.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/x/x11_atom_cache.h"
#include "ui/gfx/x/x11_path.h"
#include "ui/gfx/x/x11_window_event_manager.h"
diff --git a/ui/snapshot/snapshot.cc b/ui/snapshot/snapshot.cc
index 92af3365..660a900 100644
--- a/ui/snapshot/snapshot.cc
+++ b/ui/snapshot/snapshot.cc
@@ -14,6 +14,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_util.h"
namespace ui {
diff --git a/ui/views/controls/image_view.cc b/ui/views/controls/image_view.cc
index 0909f06..a0825bd 100644
--- a/ui/views/controls/image_view.cc
+++ b/ui/views/controls/image_view.cc
@@ -13,6 +13,7 @@
#include "skia/ext/image_operations.h"
#include "ui/base/metadata/metadata_impl_macros.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/native_theme/themed_vector_icon.h"
#include "ui/views/image_model_utils.h"
diff --git a/ui/views/drag_utils_mac.mm b/ui/views/drag_utils_mac.mm
index 256913a..83c1488 100644
--- a/ui/views/drag_utils_mac.mm
+++ b/ui/views/drag_utils_mac.mm
@@ -4,6 +4,8 @@
#include "ui/views/drag_utils.h"
+#include "base/notreached.h"
+
namespace views {
void RunShellDrag(gfx::NativeView view,
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h b/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
index 2c3bc9d..b5581344 100644
--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
@@ -16,6 +16,7 @@
#include "ui/base/dragdrop/mojom/drag_drop_types.mojom-shared.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/gfx/geometry/point_f.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/platform_window/wm/wm_drag_handler.h"
#include "ui/platform_window/wm/wm_drop_handler.h"
diff --git a/weblayer/browser/favicon/favicon_callback_proxy.cc b/weblayer/browser/favicon/favicon_callback_proxy.cc
index b1b8871..4bcd93e 100644
--- a/weblayer/browser/favicon/favicon_callback_proxy.cc
+++ b/weblayer/browser/favicon/favicon_callback_proxy.cc
@@ -8,6 +8,7 @@
#include "ui/gfx/android/java_bitmap.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "url/gurl.h"
#include "weblayer/browser/java/jni/FaviconCallbackProxy_jni.h"
#include "weblayer/browser/tab_impl.h"
diff --git a/weblayer/browser/profile_impl.cc b/weblayer/browser/profile_impl.cc
index 9f377e9..b514745 100644
--- a/weblayer/browser/profile_impl.cc
+++ b/weblayer/browser/profile_impl.cc
@@ -34,6 +34,7 @@
#include "services/network/public/mojom/network_context.mojom.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "weblayer/browser/browser_context_impl.h"
#include "weblayer/browser/browser_impl.h"
#include "weblayer/browser/browser_list.h"
Author: David Sanders <dsand...@ucsbalum.com>
AuthorDate: Tue Feb 22 02:23:00 2022
Commit: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
CommitDate: Tue Feb 22 02:23:00 2022
Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h
Also adds includes and forward declarations to other files which
were getting them transitively, to fix the build.
Bug: 242216
Change-Id: Ib42c1b9defada322d2326584328f45890e172607
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3446451
Reviewed-by: Nico Weber <tha...@chromium.org>
Commit-Queue: Nico Weber <tha...@chromium.org>
Owners-Override: Nico Weber <tha...@chromium.org>
Cr-Commit-Position: refs/heads/main@{#973607}
diff --git a/ash/app_list/folder_image_unittest.cc b/ash/app_list/folder_image_unittest.cc
index 9278b40..c00bc2f 100644
--- a/ash/app_list/folder_image_unittest.cc
+++ b/ash/app_list/folder_image_unittest.cc
@@ -16,6 +16,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/skia_util.h"
namespace ash {
diff --git a/ash/assistant/util/resource_util.cc b/ash/assistant/util/resource_util.cc
index 11b63cf..159190b 100644
--- a/ash/assistant/util/resource_util.cc
+++ b/ash/assistant/util/resource_util.cc
@@ -9,6 +9,7 @@
#include <string>
#include "base/logging.h"
+#include "base/notreached.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "chromeos/ui/vector_icons/vector_icons.h"
diff --git a/ash/drag_drop/drag_image_view.cc b/ash/drag_drop/drag_image_view.cc
index 839dbbc..907851d 100644
--- a/ash/drag_drop/drag_image_view.cc
+++ b/ash/drag_drop/drag_image_view.cc
@@ -16,6 +16,7 @@
#include "ui/display/display.h"
#include "ui/display/screen.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/resources/grit/ui_resources.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/login/ui/horizontal_image_sequence_animation_decoder.cc b/ash/login/ui/horizontal_image_sequence_animation_decoder.cc
index b1a8a95..feeb1c1 100644
--- a/ash/login/ui/horizontal_image_sequence_animation_decoder.cc
+++ b/ash/login/ui/horizontal_image_sequence_animation_decoder.cc
@@ -4,6 +4,8 @@
#include "ash/login/ui/horizontal_image_sequence_animation_decoder.h"
+#include "ui/gfx/image/image_skia_rep.h"
+
namespace ash {
HorizontalImageSequenceAnimationDecoder::
diff --git a/ash/public/cpp/external_arc/message_center/arc_notification_item_impl.cc b/ash/public/cpp/external_arc/message_center/arc_notification_item_impl.cc
index e2958b9..7912e80 100644
--- a/ash/public/cpp/external_arc/message_center/arc_notification_item_impl.cc
+++ b/ash/public/cpp/external_arc/message_center/arc_notification_item_impl.cc
@@ -17,6 +17,7 @@
#include "base/strings/utf_string_conversions.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/message_center/public/cpp/message_center_constants.h"
#include "ui/message_center/public/cpp/notification.h"
#include "ui/message_center/public/cpp/notification_types.h"
diff --git a/ash/public/cpp/holding_space/holding_space_image.cc b/ash/public/cpp/holding_space/holding_space_image.cc
index 3653686..d0bd3a5 100644
--- a/ash/public/cpp/holding_space/holding_space_image.cc
+++ b/ash/public/cpp/holding_space/holding_space_image.cc
@@ -15,6 +15,7 @@
#include "base/location.h"
#include "chromeos/ui/base/file_icon_util.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/skia_util.h"
diff --git a/ash/public/cpp/holding_space/holding_space_image.h b/ash/public/cpp/holding_space/holding_space_image.h
index be0b747..84447d8 100644
--- a/ash/public/cpp/holding_space/holding_space_image.h
+++ b/ash/public/cpp/holding_space/holding_space_image.h
@@ -12,6 +12,7 @@
#include "base/files/file.h"
#include "base/timer/timer.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
namespace ash {
diff --git a/ash/public/cpp/holding_space/holding_space_image_unittest.cc b/ash/public/cpp/holding_space/holding_space_image_unittest.cc
index d0c36b6a..9395d6e 100644
--- a/ash/public/cpp/holding_space/holding_space_image_unittest.cc
+++ b/ash/public/cpp/holding_space/holding_space_image_unittest.cc
@@ -19,9 +19,11 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/color_palette.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_unittest_util.h"
#include "ui/gfx/paint_vector_icon.h"
diff --git a/ash/shelf/shelf_view_test_api.cc b/ash/shelf/shelf_view_test_api.cc
index 519c293a..a8be137 100644
--- a/ash/shelf/shelf_view_test_api.cc
+++ b/ash/shelf/shelf_view_test_api.cc
@@ -13,6 +13,7 @@
#include "ash/shelf/shelf_view.h"
#include "ash/shelf/shelf_widget.h"
#include "base/run_loop.h"
+#include "base/time/time.h"
#include "ui/views/animation/bounds_animator.h"
#include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/controls/separator.h"
diff --git a/ash/shelf/shelf_view_test_api.h b/ash/shelf/shelf_view_test_api.h
index 7a7b89d..5420ac3 100644
--- a/ash/shelf/shelf_view_test_api.h
+++ b/ash/shelf/shelf_view_test_api.h
@@ -6,8 +6,13 @@
#define ASH_SHELF_SHELF_VIEW_TEST_API_H_
#include "ash/public/cpp/shelf_item.h"
+#include "base/callback_forward.h"
#include "ui/base/ui_base_types.h"
+namespace base {
+class TimeDelta;
+}
+
namespace gfx {
class Point;
class Rect;
diff --git a/chrome/browser/android/tab_favicon.cc b/chrome/browser/android/tab_favicon.cc
index 0da8677..92f0436 100644
--- a/chrome/browser/android/tab_favicon.cc
+++ b/chrome/browser/android/tab_favicon.cc
@@ -13,6 +13,7 @@
#include "ui/gfx/android/java_bitmap.h"
#include "ui/gfx/favicon_size.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using base::android::JavaParamRef;
using base::android::ScopedJavaLocalRef;
diff --git a/chrome/browser/apps/icon_standardizer.cc b/chrome/browser/apps/icon_standardizer.cc
index ba18f44..15fde45 100644
--- a/chrome/browser/apps/icon_standardizer.cc
+++ b/chrome/browser/apps/icon_standardizer.cc
@@ -6,6 +6,7 @@
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace apps {
diff --git a/chrome/browser/apps/icon_standardizer_unittest.cc b/chrome/browser/apps/icon_standardizer_unittest.cc
index 22443bc..e1dd7ce 100644
--- a/chrome/browser/apps/icon_standardizer_unittest.cc
+++ b/chrome/browser/apps/icon_standardizer_unittest.cc
@@ -5,6 +5,8 @@
#include "chrome/browser/apps/icon_standardizer.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkImage.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
diff --git a/chrome/browser/ash/accessibility/magnification_manager.cc b/chrome/browser/ash/accessibility/magnification_manager.cc
index 76ead7f..2d662a7 100644
--- a/chrome/browser/ash/accessibility/magnification_manager.cc
+++ b/chrome/browser/ash/accessibility/magnification_manager.cc
@@ -21,6 +21,8 @@
#include "content/public/browser/focused_node_details.h"
#include "ui/accessibility/accessibility_features.h"
#include "ui/accessibility/ax_role_properties.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/views/accessibility/ax_event_manager.h"
#include "ui/views/accessibility/view_accessibility.h"
diff --git a/chrome/browser/ash/accessibility/magnification_manager.h b/chrome/browser/ash/accessibility/magnification_manager.h
index c364e1f..3f46c22 100644
--- a/chrome/browser/ash/accessibility/magnification_manager.h
+++ b/chrome/browser/ash/accessibility/magnification_manager.h
@@ -8,6 +8,7 @@
#include "ash/public/cpp/accessibility_controller_enums.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observation.h"
+#include "base/time/time.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_observer.h"
#include "components/session_manager/core/session_manager.h"
@@ -18,6 +19,11 @@
class PrefChangeRegistrar;
+namespace gfx {
+class Point;
+class Rect;
+}
+
namespace ash {
// MagnificationManager controls the Fullscreen and Docked magnifier from
diff --git a/chrome/browser/ash/login/session/user_session_initializer.h b/chrome/browser/ash/login/session/user_session_initializer.h
index 02c9bb9..1c007d80 100644
--- a/chrome/browser/ash/login/session/user_session_initializer.h
+++ b/chrome/browser/ash/login/session/user_session_initializer.h
@@ -7,6 +7,8 @@
#include <memory>
+#include "base/callback.h"
+#include "base/time/time.h"
#include "components/session_manager/core/session_manager_observer.h"
#include "components/user_manager/user.h"
diff --git a/chrome/browser/chromeos/arc/open_with_menu_unittest.cc b/chrome/browser/chromeos/arc/open_with_menu_unittest.cc
index 485b389..7e01c7e 100644
--- a/chrome/browser/chromeos/arc/open_with_menu_unittest.cc
+++ b/chrome/browser/chromeos/arc/open_with_menu_unittest.cc
@@ -21,6 +21,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace arc {
diff --git a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
index 9cf450a..d03f671 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_function_base.cc
@@ -16,6 +16,7 @@
#include "content/public/browser/browser_thread.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/codec/jpeg_codec.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/image/image_skia_operations.h"
using content::BrowserThread;
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
index 7ac039c..b50c80a 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -73,6 +73,7 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/webui/web_ui_util.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using content::BrowserContext;
using content::BrowserThread;
diff --git a/chrome/browser/extensions/chrome_app_icon_unittest.cc b/chrome/browser/extensions/chrome_app_icon_unittest.cc
index 3b53213..122d0318 100644
--- a/chrome/browser/extensions/chrome_app_icon_unittest.cc
+++ b/chrome/browser/extensions/chrome_app_icon_unittest.cc
@@ -23,6 +23,7 @@
#include "extensions/common/constants.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_unittest_util.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
index 59c0f627..5b90910 100644
--- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
+++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc
@@ -32,6 +32,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/skia_util.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chrome/browser/extensions/extension_action_storage_manager.cc b/chrome/browser/extensions/extension_action_storage_manager.cc
index 939d96a8..29e2286f 100644
--- a/chrome/browser/extensions/extension_action_storage_manager.cc
+++ b/chrome/browser/extensions/extension_action_storage_manager.cc
@@ -22,6 +22,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace extensions {
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index 1d9c37e..0340ad1 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -40,6 +40,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_types.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using extensions::Extension;
using extensions::Manifest;
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index ac1d111..d01c32bd 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -48,6 +48,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/favicon_size.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using content::WebContents;
using extensions::Extension;
diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h
index 57cfc64..03af516 100644
--- a/chrome/browser/media/webrtc/desktop_media_list.h
+++ b/chrome/browser/media/webrtc/desktop_media_list.h
@@ -8,8 +8,10 @@
#include <string>
#include <vector>
+#include "base/callback_forward.h"
#include "base/time/time.h"
#include "content/public/browser/desktop_media_id.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
#include "ui/gfx/image/image_skia.h"
class DesktopMediaListObserver;
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h
index c56bc6d..9c77a2d5 100644
--- a/chrome/browser/media/webrtc/desktop_media_list_base.h
+++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
@@ -5,10 +5,12 @@
#ifndef CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_BASE_H_
#define CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_BASE_H_
+#include "base/callback.h"
#include "base/memory/raw_ptr.h"
#include "chrome/browser/media/webrtc/desktop_media_list.h"
#include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
#include "content/public/browser/desktop_media_id.h"
+#include "ui/gfx/geometry/size.h"
namespace gfx {
class Image;
diff --git a/chrome/browser/media/webrtc/fake_desktop_media_list.cc b/chrome/browser/media/webrtc/fake_desktop_media_list.cc
index b1db454..87f2e8d 100644
--- a/chrome/browser/media/webrtc/fake_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/fake_desktop_media_list.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/callback.h"
#include "base/strings/string_number_conversions.h"
#include "chrome/browser/media/webrtc/desktop_media_list.h"
#include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
diff --git a/chrome/browser/notifications/platform_notification_service_unittest.cc b/chrome/browser/notifications/platform_notification_service_unittest.cc
index 82c751a6..84a27f0 100644
--- a/chrome/browser/notifications/platform_notification_service_unittest.cc
+++ b/chrome/browser/notifications/platform_notification_service_unittest.cc
@@ -40,6 +40,7 @@
#include "third_party/blink/public/mojom/notifications/notification.mojom.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "url/gurl.h"
#if BUILDFLAG(ENABLE_EXTENSIONS)
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index 4e799ba..67bd3bfb 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -55,6 +55,7 @@
#include "ui/base/models/tree_node_iterator.h"
#include "ui/gfx/favicon_size.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using bookmarks::BookmarkModel;
using bookmarks::BookmarkNode;
diff --git a/chrome/browser/task_manager/providers/worker_task.cc b/chrome/browser/task_manager/providers/worker_task.cc
index a15cb07..54aa38a 100644
--- a/chrome/browser/task_manager/providers/worker_task.cc
+++ b/chrome/browser/task_manager/providers/worker_task.cc
@@ -6,6 +6,7 @@
#include <string>
+#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/taskbar/taskbar_decorator_win.cc b/chrome/browser/taskbar/taskbar_decorator_win.cc
index 240b0fd..5066f716 100644
--- a/chrome/browser/taskbar/taskbar_decorator_win.cc
+++ b/chrome/browser/taskbar/taskbar_decorator_win.cc
@@ -32,6 +32,7 @@
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkFont.h"
+#include "third_party/skia/include/core/SkImage.h"
#include "third_party/skia/include/core/SkImageEncoder.h"
#include "third_party/skia/include/core/SkImageInfo.h"
#include "third_party/skia/include/core/SkRRect.h"
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index 7e20e91..2a16c7cf 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -53,6 +53,7 @@
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
using content::BrowserThread;
using extensions::Extension;
diff --git a/chrome/browser/ui/app_list/DEPS b/chrome/browser/ui/app_list/DEPS
index fac7ee0..05680e7 100644
--- a/chrome/browser/ui/app_list/DEPS
+++ b/chrome/browser/ui/app_list/DEPS
@@ -21,4 +21,8 @@
"+ash/app_list/views/apps_grid_view.h",
"+ash/shell.h",
],
+
+ "app_list_syncable_service_unittest\.cc": [
+ "+cc/base/math_util.h",
+ ],
}
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc b/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
index 7edbded..4e14a958 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
@@ -17,6 +17,7 @@
#include "base/test/scoped_command_line.h"
#include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
+#include "cc/base/math_util.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/app_list/app_list_client_impl.h"
diff --git a/chrome/browser/ui/app_list/arc/arc_app_icon.h b/chrome/browser/ui/app_list/arc/arc_app_icon.h
index 2f165ad..231a830 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_icon.h
+++ b/chrome/browser/ui/app_list/arc/arc_app_icon.h
@@ -12,6 +12,7 @@
#include <vector>
#include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
#include "ui/base/layout.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
diff --git a/chrome/browser/ui/app_list/md_icon_normalizer.cc b/chrome/browser/ui/app_list/md_icon_normalizer.cc
index 4fccbf7..40d5a07 100644
--- a/chrome/browser/ui/app_list/md_icon_normalizer.cc
+++ b/chrome/browser/ui/app_list/md_icon_normalizer.cc
@@ -15,6 +15,7 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
// The implementation is copied and adapted from the Android Launcher.
// See com.android.launcher3.graphics.IconNormalizer.java in the Android source.
diff --git a/chrome/browser/ui/app_list/search/app_search_provider.h b/chrome/browser/ui/app_list/search/app_search_provider.h
index ff6871c..8a00202 100644
--- a/chrome/browser/ui/app_list/search/app_search_provider.h
+++ b/chrome/browser/ui/app_list/search/app_search_provider.h
@@ -11,6 +11,7 @@
#include "base/containers/flat_map.h"
#include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
#include "chrome/browser/ui/app_list/search/search_provider.h"
class AppListControllerDelegate;
diff --git a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h
index 3efe593..f0f7e35 100644
--- a/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h
+++ b/chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.h
@@ -18,6 +18,10 @@
enum class ArcPlayStoreSearchRequestState;
} // namespace arc
+namespace base {
+class TimeTicks;
+} // namespace base
+
namespace app_list {
class ArcPlayStoreSearchProvider : public SearchProvider {
diff --git a/chrome/browser/ui/app_list/search/common/url_icon_source.cc b/chrome/browser/ui/app_list/search/common/url_icon_source.cc
index 69a770d..349db2a 100644
--- a/chrome/browser/ui/app_list/search/common/url_icon_source.cc
+++ b/chrome/browser/ui/app_list/search/common/url_icon_source.cc
@@ -18,6 +18,7 @@
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
using content::BrowserThread;
diff --git a/chrome/browser/ui/app_list/search/search_controller.h b/chrome/browser/ui/app_list/search/search_controller.h
index 46ab832..c5bd10b 100644
--- a/chrome/browser/ui/app_list/search/search_controller.h
+++ b/chrome/browser/ui/app_list/search/search_controller.h
@@ -27,6 +27,11 @@
enum class AppListSearchResultType;
}
+namespace base {
+class Time;
+class TimeDelta;
+}
+
namespace app_list {
class SearchProvider;
diff --git a/chrome/browser/ui/app_list/search/search_controller_impl.h b/chrome/browser/ui/app_list/search/search_controller_impl.h
index 557ab3b..2c1ddef 100644
--- a/chrome/browser/ui/app_list/search/search_controller_impl.h
+++ b/chrome/browser/ui/app_list/search/search_controller_impl.h
@@ -14,6 +14,7 @@
#include "base/callback.h"
#include "base/observer_list.h"
+#include "base/time/time.h"
#include "chrome/browser/ui/app_list/search/mixer.h"
#include "chrome/browser/ui/app_list/search/ranking/launch_data.h"
#include "chrome/browser/ui/app_list/search/search_controller.h"
diff --git a/chrome/browser/ui/ash/app_icon_color_cache.cc b/chrome/browser/ui/ash/app_icon_color_cache.cc
index 91419f2..7b4587699 100644
--- a/chrome/browser/ui/ash/app_icon_color_cache.cc
+++ b/chrome/browser/ui/ash/app_icon_color_cache.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/ui/ash/app_icon_color_cache.h"
+#include "base/callback.h"
#include "base/no_destructor.h"
#include "ui/gfx/color_analysis.h"
#include "ui/gfx/image/image_skia.h"
diff --git a/chrome/browser/ui/ash/clipboard_image_model_request.cc b/chrome/browser/ui/ash/clipboard_image_model_request.cc
index 204bdd8..628b08d 100644
--- a/chrome/browser/ui/ash/clipboard_image_model_request.cc
+++ b/chrome/browser/ui/ash/clipboard_image_model_request.cc
@@ -23,6 +23,7 @@
#include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/views/controls/webview/webview.h"
#include "ui/views/widget/widget.h"
#include "url/gurl.h"
diff --git a/chrome/browser/ui/ash/test_session_controller.cc b/chrome/browser/ui/ash/test_session_controller.cc
index c833212..3eb27c80 100644
--- a/chrome/browser/ui/ash/test_session_controller.cc
+++ b/chrome/browser/ui/ash/test_session_controller.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "ash/public/cpp/session/session_observer.h"
+#include "base/callback.h"
TestSessionController::TestSessionController() = default;
TestSessionController::~TestSessionController() = default;
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc
index 128a113..5212adab 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
@@ -44,6 +44,7 @@
#include "ui/color/color_provider.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/scoped_canvas.h"
diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
index 8da2c38..898bb77 100644
--- a/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
+++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.cc
@@ -22,6 +22,7 @@
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/render_text.h"
#include "ui/gfx/shadow_value.h"
#include "ui/gfx/skia_paint_util.h"
diff --git a/chrome/browser/ui/test/test_app_window_icon_observer.cc b/chrome/browser/ui/test/test_app_window_icon_observer.cc
index ab4db20e..9c74699 100644
--- a/chrome/browser/ui/test/test_app_window_icon_observer.cc
+++ b/chrome/browser/ui/test/test_app_window_icon_observer.cc
@@ -11,6 +11,7 @@
#include "extensions/browser/app_window/app_window.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_unittest_util.h"
TestAppWindowIconObserver::TestAppWindowIconObserver(
diff --git a/chrome/browser/ui/thumbnails/thumbnail_image.h b/chrome/browser/ui/thumbnails/thumbnail_image.h
index ee85b0c..24a8753 100644
--- a/chrome/browser/ui/thumbnails/thumbnail_image.h
+++ b/chrome/browser/ui/thumbnails/thumbnail_image.h
@@ -17,6 +17,7 @@
#include "base/sequence_checker.h"
#include "base/token.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
namespace base {
diff --git a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc
index 1b599a4..3b6c065c 100644
--- a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc
+++ b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc
@@ -35,6 +35,7 @@
#include "ui/events/event.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/native_theme/native_theme.h"
#include "ui/resources/grit/ui_resources.h"
diff --git a/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc b/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc
index 6f832a40..cbef196 100644
--- a/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc
+++ b/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc
@@ -21,6 +21,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/metadata/metadata_impl_macros.h"
#include "ui/base/webui/web_ui_util.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/resources/grit/ui_resources.h"
#include "ui/views/border.h"
#include "ui/views/controls/button/label_button.h"
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
index c0f9786..3ec9fd4 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
+++ b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
@@ -11,6 +11,7 @@
#include "base/memory/scoped_refptr.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/browser/ui/views/status_icons/status_icon_button_linux.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/message_center/public/cpp/notifier_id.h"
#if defined(USE_DBUS)
diff --git a/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc b/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc
index 321b1d8..a1e6202 100644
--- a/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc
+++ b/chrome/browser/ui/views/web_apps/web_app_info_image_source.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/views/web_apps/web_app_info_image_source.h"
-#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
WebAppInfoImageSource::WebAppInfoImageSource(
int dip_size,
diff --git a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc
index 43233c9..0e3578e 100644
--- a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc
@@ -48,6 +48,7 @@
#include "ui/base/ui_base_features.h"
#include "ui/events/event.h"
#include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_chromeos.cc b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_chromeos.cc
index 1082399..39b835ae 100644
--- a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_chromeos.cc
+++ b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_chromeos.cc
@@ -29,6 +29,7 @@
#include "ui/base/webui/web_ui_util.h"
#include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace chromeos {
diff --git a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc
index 7289a4f..516353b 100644
--- a/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc
+++ b/chrome/browser/ui/webui/chromeos/edu_account_login_handler_unittest.cc
@@ -31,6 +31,7 @@
#include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_unittest_util.h"
using testing::_;
diff --git a/chrome/browser/ui/webui/chromeos/user_image_source.cc b/chrome/browser/ui/webui/chromeos/user_image_source.cc
index 981abd6..1d7af66 100644
--- a/chrome/browser/ui/webui/chromeos/user_image_source.cc
+++ b/chrome/browser/ui/webui/chromeos/user_image_source.cc
@@ -18,6 +18,7 @@
#include "ui/display/display.h"
#include "ui/display/screen.h"
#include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "url/third_party/mozilla/url_parse.h"
namespace chromeos {
diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc
index c489d37..dfe7f2a6 100644
--- a/chrome/browser/ui/webui/fileicon_source.cc
+++ b/chrome/browser/ui/webui/fileicon_source.cc
@@ -19,6 +19,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "url/gurl.h"
namespace {
diff --git a/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc b/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc
index f72dba3..9bde33c 100644
--- a/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc
@@ -37,6 +37,7 @@
#include "ui/base/webui/web_ui_util.h"
#include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace chromeos {
namespace settings {
diff --git a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc
index b7ef1f6..8135116 100644
--- a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc
@@ -28,6 +28,7 @@
#include "ui/base/webui/web_ui_util.h"
#include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace chromeos {
namespace settings {
diff --git a/chrome/browser/ui/webui/util/image_util.cc b/chrome/browser/ui/webui/util/image_util.cc
index e8ec406..b5ae8972 100644
--- a/chrome/browser/ui/webui/util/image_util.cc
+++ b/chrome/browser/ui/webui/util/image_util.cc
@@ -8,6 +8,7 @@
#include "third_party/skia/include/core/SkStream.h"
#include "ui/gfx/image/buffer_w_stream.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace webui {
diff --git a/chrome/browser/web_applications/test/web_app_icon_test_utils.cc b/chrome/browser/web_applications/test/web_app_icon_test_utils.cc
index 1345865c..456e29d 100644
--- a/chrome/browser/web_applications/test/web_app_icon_test_utils.cc
+++ b/chrome/browser/web_applications/test/web_app_icon_test_utils.cc
@@ -21,6 +21,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "url/gurl.h"
namespace web_app {
diff --git a/chrome/browser/web_applications/web_app_icon_generator.cc b/chrome/browser/web_applications/web_app_icon_generator.cc
index 5f374fa..e61cdbf 100644
--- a/chrome/browser/web_applications/web_app_icon_generator.cc
+++ b/chrome/browser/web_applications/web_app_icon_generator.cc
@@ -26,6 +26,7 @@
#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_rep.h"
namespace web_app {
diff --git a/chrome/browser/web_applications/web_app_icon_generator_unittest.cc b/chrome/browser/web_applications/web_app_icon_generator_unittest.cc
index a774ebe..f29d4a1 100644
--- a/chrome/browser/web_applications/web_app_icon_generator_unittest.cc
+++ b/chrome/browser/web_applications/web_app_icon_generator_unittest.cc
@@ -16,6 +16,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/color_utils.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace web_app {
diff --git a/chrome/browser/web_applications/web_app_icon_manager.cc b/chrome/browser/web_applications/web_app_icon_manager.cc
index 31b536e..ed126df7 100644
--- a/chrome/browser/web_applications/web_app_icon_manager.cc
+++ b/chrome/browser/web_applications/web_app_icon_manager.cc
@@ -34,6 +34,7 @@
#include "ui/base/layout.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/favicon_size.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace web_app {
diff --git a/components/arc/common/intent_helper/activity_icon_loader.cc b/components/arc/common/intent_helper/activity_icon_loader.cc
index 4eb11b5..d61aa05 100644
--- a/components/arc/common/intent_helper/activity_icon_loader.cc
+++ b/components/arc/common/intent_helper/activity_icon_loader.cc
@@ -19,6 +19,7 @@
#include "ui/base/layout.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/components/arc/arc_util.h"
diff --git a/components/arc/common/intent_helper/activity_icon_loader_unittest.cc b/components/arc/common/intent_helper/activity_icon_loader_unittest.cc
index 0f44cb5..c6738d4 100644
--- a/components/arc/common/intent_helper/activity_icon_loader_unittest.cc
+++ b/components/arc/common/intent_helper/activity_icon_loader_unittest.cc
@@ -15,6 +15,7 @@
#include "components/arc/common/intent_helper/adaptive_icon_delegate.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace arc {
namespace internal {
diff --git a/components/favicon_base/favicon_util.cc b/components/favicon_base/favicon_util.cc
index c179615c..5834055 100644
--- a/components/favicon_base/favicon_util.cc
+++ b/components/favicon_base/favicon_util.cc
@@ -23,6 +23,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_png_rep.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#if BUILDFLAG(IS_MAC)
#include "base/mac/mac_util.h"
diff --git a/components/favicon_base/select_favicon_frames.cc b/components/favicon_base/select_favicon_frames.cc
index e4e9a13..bc40836 100644
--- a/components/favicon_base/select_favicon_frames.cc
+++ b/components/favicon_base/select_favicon_frames.cc
@@ -20,6 +20,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
namespace {
diff --git a/components/favicon_base/select_favicon_frames_unittest.cc b/components/favicon_base/select_favicon_frames_unittest.cc
index 6d0bc46e..a45614e 100644
--- a/components/favicon_base/select_favicon_frames_unittest.cc
+++ b/components/favicon_base/select_favicon_frames_unittest.cc
@@ -12,7 +12,9 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/layout.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using std::vector;
diff --git a/components/media_message_center/media_notification_background_ash_impl.cc b/components/media_message_center/media_notification_background_ash_impl.cc
index 221e9b3..2142b4f5 100644
--- a/components/media_message_center/media_notification_background_ash_impl.cc
+++ b/components/media_message_center/media_notification_background_ash_impl.cc
@@ -6,6 +6,7 @@
#include "base/i18n/rtl.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/views/view.h"
diff --git a/components/media_message_center/media_notification_background_ash_impl.h b/components/media_message_center/media_notification_background_ash_impl.h
index 02c8d7a..217885d 100644
--- a/components/media_message_center/media_notification_background_ash_impl.h
+++ b/components/media_message_center/media_notification_background_ash_impl.h
@@ -10,6 +10,10 @@
#include "base/component_export.h"
#include "ui/gfx/image/image_skia.h"
+namespace gfx {
+class Rect;
+}
+
namespace media_message_center {
// MediaNotificationBackground for CrOS media notifications.
diff --git a/components/media_message_center/media_notification_background_ash_impl_unittest.cc b/components/media_message_center/media_notification_background_ash_impl_unittest.cc
index 25e553e..bfc22ba 100644
--- a/components/media_message_center/media_notification_background_ash_impl_unittest.cc
+++ b/components/media_message_center/media_notification_background_ash_impl_unittest.cc
@@ -6,6 +6,7 @@
#include "base/i18n/rtl.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/geometry/rect.h"
namespace media_message_center {
diff --git a/extensions/browser/extension_action.cc b/extensions/browser/extension_action.cc
index b33485a..d186794 100644
--- a/extensions/browser/extension_action.cc
+++ b/extensions/browser/extension_action.cc
@@ -31,6 +31,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/skbitmap_operations.h"
#include "url/gurl.h"
diff --git a/extensions/browser/extension_icon_image.cc b/extensions/browser/extension_icon_image.cc
index 04c7e6e..f18c0a8 100644
--- a/extensions/browser/extension_icon_image.cc
+++ b/extensions/browser/extension_icon_image.cc
@@ -19,6 +19,7 @@
#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_rep.h"
#include "ui/gfx/image/image_skia_source.h"
// The ImageSkia provided by extensions::IconImage contains ImageSkiaReps that
diff --git a/extensions/browser/extension_icon_image_unittest.cc b/extensions/browser/extension_icon_image_unittest.cc
index 7dab4f9..bca8511 100644
--- a/extensions/browser/extension_icon_image_unittest.cc
+++ b/extensions/browser/extension_icon_image_unittest.cc
@@ -20,6 +20,7 @@
#include "skia/ext/image_operations.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/skia_util.h"
diff --git a/extensions/browser/image_loader.cc b/extensions/browser/image_loader.cc
index c738684c..d8490d37 100644
--- a/extensions/browser/image_loader.cc
+++ b/extensions/browser/image_loader.cc
@@ -31,6 +31,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_family.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using content::BrowserThread;
diff --git a/extensions/browser/image_loader_unittest.cc b/extensions/browser/image_loader_unittest.cc
index e29a635..d277504 100644
--- a/extensions/browser/image_loader_unittest.cc
+++ b/extensions/browser/image_loader_unittest.cc
@@ -31,6 +31,7 @@
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_family.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
using extensions::mojom::ManifestLocation;
diff --git a/ui/aura/cursor/cursor_util.cc b/ui/aura/cursor/cursor_util.cc
index 74d41143..c3660ee 100644
--- a/ui/aura/cursor/cursor_util.cc
+++ b/ui/aura/cursor/cursor_util.cc
@@ -14,6 +14,7 @@
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/skbitmap_operations.h"
namespace aura {
diff --git a/ui/aura/cursor/cursors_aura.cc b/ui/aura/cursor/cursors_aura.cc
index 5510d96..ad4e257 100644
--- a/ui/aura/cursor/cursors_aura.cc
+++ b/ui/aura/cursor/cursors_aura.cc
@@ -15,6 +15,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/resources/grit/ui_resources.h"
#if BUILDFLAG(IS_WIN)
diff --git a/ui/base/dragdrop/os_exchange_data_provider.h b/ui/base/dragdrop/os_exchange_data_provider.h
index a8f1141..5fad161 100644
--- a/ui/base/dragdrop/os_exchange_data_provider.h
+++ b/ui/base/dragdrop/os_exchange_data_provider.h
@@ -19,6 +19,10 @@
#include "ui/base/dragdrop/download_file_interface.h"
#include "url/gurl.h"
+#if BUILDFLAG(IS_WIN)
+#include "base/callback_forward.h"
+#endif
+
#if defined(USE_AURA) || BUILDFLAG(IS_APPLE)
#include "ui/gfx/geometry/vector2d.h"
#include "ui/gfx/image/image_skia.h"
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
index 4d7b2f1..8cabb84 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -39,6 +39,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/l10n/l10n_util_win.h"
#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/skbitmap_operations.h"
#include "ui/strings/grit/ui_strings.h"
diff --git a/ui/base/models/image_model.h b/ui/base/models/image_model.h
index 916e94f..47fee6d 100644
--- a/ui/base/models/image_model.h
+++ b/ui/base/models/image_model.h
@@ -11,6 +11,7 @@
#include "third_party/skia/include/core/SkColor.h"
#include "ui/color/color_id.h"
#include "ui/gfx/color_palette.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index fff568d..cce05971 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -47,6 +47,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/strings/grit/app_locale_settings.h"
#include "url/gurl.h"
diff --git a/ui/base/x/x11_desktop_window_move_client.cc b/ui/base/x/x11_desktop_window_move_client.cc
index c420f52..f7ae333 100644
--- a/ui/base/x/x11_desktop_window_move_client.cc
+++ b/ui/base/x/x11_desktop_window_move_client.cc
@@ -6,6 +6,7 @@
#include "ui/base/x/x11_util.h"
#include "ui/events/event.h"
+#include "ui/gfx/geometry/rect.h"
namespace ui {
diff --git a/ui/base/x/x11_desktop_window_move_client.h b/ui/base/x/x11_desktop_window_move_client.h
index c17a278..9ec14ee 100644
--- a/ui/base/x/x11_desktop_window_move_client.h
+++ b/ui/base/x/x11_desktop_window_move_client.h
@@ -11,6 +11,10 @@
#include "ui/base/x/x11_whole_screen_move_loop.h"
#include "ui/gfx/geometry/point.h"
+namespace gfx {
+class Rect;
+}
+
namespace ui {
// When we're dragging tabs, we need to manually position our window.
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index c4976a7..2f885194 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -43,6 +43,7 @@
#include "ui/gfx/geometry/rounded_corners_f.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/geometry/transform.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/interpolated_transform.h"
namespace ui {
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index 24042be..26805d2 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -26,6 +26,7 @@
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/geometry/transform.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/scoped_canvas.h"
#include "ui/gfx/skia_paint_util.h"
#include "ui/gfx/switches.h"
diff --git a/ui/gfx/image/canvas_image_source.cc b/ui/gfx/image/canvas_image_source.cc
index 13274ed..dead051 100644
--- a/ui/gfx/image/canvas_image_source.cc
+++ b/ui/gfx/image/canvas_image_source.cc
@@ -11,6 +11,7 @@
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/switches.h"
namespace gfx {
diff --git a/ui/gfx/image/image_family_unittest.cc b/ui/gfx/image/image_family_unittest.cc
index 4bd2dc6..0e38547 100644
--- a/ui/gfx/image/image_family_unittest.cc
+++ b/ui/gfx/image/image_family_unittest.cc
@@ -5,6 +5,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkImageInfo.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"
diff --git a/ui/gfx/image/image_generic.cc b/ui/gfx/image/image_generic.cc
index f598390..25849fc 100644
--- a/ui/gfx/image/image_generic.cc
+++ b/ui/gfx/image/image_generic.cc
@@ -10,6 +10,7 @@
#include "base/logging.h"
#include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
namespace gfx {
diff --git a/ui/gfx/image/image_ios.mm b/ui/gfx/image/image_ios.mm
index 17b6b92..130f11e 100644
--- a/ui/gfx/image/image_ios.mm
+++ b/ui/gfx/image/image_ios.mm
@@ -17,6 +17,7 @@
#include "ui/gfx/image/image_internal.h"
#include "ui/gfx/image/image_png_rep.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_util_ios.h"
namespace {
diff --git a/ui/gfx/image/image_mac_unittest.mm b/ui/gfx/image/image_mac_unittest.mm
index d0fff04..b37bcac 100644
--- a/ui/gfx/image/image_mac_unittest.mm
+++ b/ui/gfx/image/image_mac_unittest.mm
@@ -10,6 +10,7 @@
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_png_rep.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_util_mac.h"
#include "ui/gfx/image/image_unittest_util.h"
diff --git a/ui/gfx/image/image_skia.cc b/ui/gfx/image/image_skia.cc
index 05971d1..27dbf9b 100644
--- a/ui/gfx/image/image_skia.cc
+++ b/ui/gfx/image/image_skia.cc
@@ -22,6 +22,7 @@
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/switches.h"
diff --git a/ui/gfx/image/image_skia.h b/ui/gfx/image/image_skia.h
index 60cc102..a8cf256 100644
--- a/ui/gfx/image/image_skia.h
+++ b/ui/gfx/image/image_skia.h
@@ -10,10 +10,11 @@
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
+#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/gfx_export.h"
-#include "ui/gfx/image/image_skia_rep.h"
namespace gfx {
+class ImageSkiaRep;
class ImageSkiaSource;
class Size;
diff --git a/ui/gfx/image/image_skia_operations_unittest.cc b/ui/gfx/image/image_skia_operations_unittest.cc
index 473e2d5..b7e1052d 100644
--- a/ui/gfx/image/image_skia_operations_unittest.cc
+++ b/ui/gfx/image/image_skia_operations_unittest.cc
@@ -5,7 +5,9 @@
#include "ui/gfx/image/image_skia_operations.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace gfx {
namespace {
diff --git a/ui/gfx/image/image_skia_util_ios.mm b/ui/gfx/image/image_skia_util_ios.mm
index 4ecbfdc..7cc5814 100644
--- a/ui/gfx/image/image_skia_util_ios.mm
+++ b/ui/gfx/image/image_skia_util_ios.mm
@@ -10,6 +10,7 @@
#include "skia/ext/skia_utils_ios.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace gfx {
diff --git a/ui/gfx/image/image_skia_util_mac.mm b/ui/gfx/image/image_skia_util_mac.mm
index 35b3845..49b3c726 100644
--- a/ui/gfx/image/image_skia_util_mac.mm
+++ b/ui/gfx/image/image_skia_util_mac.mm
@@ -16,6 +16,7 @@
#include "skia/ext/skia_utils_mac.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace {
diff --git a/ui/gfx/image/image_unittest.cc b/ui/gfx/image/image_unittest.cc
index 81f050c..166efeb9 100644
--- a/ui/gfx/image/image_unittest.cc
+++ b/ui/gfx/image/image_unittest.cc
@@ -10,9 +10,11 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPaint.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_png_rep.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_unittest_util.h"
#if BUILDFLAG(IS_IOS)
diff --git a/ui/gfx/image/image_unittest_util.cc b/ui/gfx/image/image_unittest_util.cc
index f9458f81..2da64db 100644
--- a/ui/gfx/image/image_unittest_util.cc
+++ b/ui/gfx/image/image_unittest_util.cc
@@ -17,6 +17,7 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#if BUILDFLAG(IS_IOS)
#include "base/mac/scoped_cftyperef.h"
diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc
index 893c037a..63305ce 100644
--- a/ui/gfx/image/image_util.cc
+++ b/ui/gfx/image/image_util.cc
@@ -17,6 +17,7 @@
#include "ui/gfx/codec/webp_codec.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/resize_image_dimensions.h"
namespace {
diff --git a/ui/gfx/nine_image_painter.cc b/ui/gfx/nine_image_painter.cc
index b2292b3f..f183b27 100644
--- a/ui/gfx/nine_image_painter.cc
+++ b/ui/gfx/nine_image_painter.cc
@@ -19,6 +19,7 @@
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/scoped_canvas.h"
namespace gfx {
diff --git a/ui/gfx/nine_image_painter_unittest.cc b/ui/gfx/nine_image_painter_unittest.cc
index 9897d00..be755f5 100644
--- a/ui/gfx/nine_image_painter_unittest.cc
+++ b/ui/gfx/nine_image_painter_unittest.cc
@@ -13,6 +13,7 @@
#include "ui/gfx/geometry/vector2d.h"
#include "ui/gfx/geometry/vector2d_conversions.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
namespace gfx {
diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc
index 5b6f81b..74a3edf5 100644
--- a/ui/gtk/gtk_ui.cc
+++ b/ui/gtk/gtk_ui.cc
@@ -47,6 +47,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gfx/skbitmap_operations.h"
#include "ui/gtk/gtk_compat.h"
diff --git a/ui/gtk/nav_button_provider_gtk.cc b/ui/gtk/nav_button_provider_gtk.cc
index 27239539..8d1529f 100644
--- a/ui/gtk/nav_button_provider_gtk.cc
+++ b/ui/gtk/nav_button_provider_gtk.cc
@@ -8,6 +8,7 @@
#include "ui/base/glib/glib_cast.h"
#include "ui/base/glib/scoped_gobject.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_skia_source.h"
#include "ui/gtk/gtk_compat.h"
#include "ui/gtk/gtk_util.h"
diff --git a/ui/ozone/platform/wayland/host/wayland_surface.cc b/ui/ozone/platform/wayland/host/wayland_surface.cc
index 9a4c7a51..b9c2a12 100644
--- a/ui/ozone/platform/wayland/host/wayland_surface.cc
+++ b/ui/ozone/platform/wayland/host/wayland_surface.cc
@@ -18,6 +18,7 @@
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/geometry/size_f.h"
+#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/ozone/platform/wayland/common/wayland_util.h"
#include "ui/ozone/platform/wayland/host/overlay_prioritizer.h"
diff --git a/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc b/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
index 87d7814..cd9a52c 100644
--- a/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
+++ b/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
@@ -16,6 +16,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/geometry/rounded_corners_f.h"
#include "ui/gfx/geometry/rrect_f.h"
+#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/gpu_fence_handle.h"
#include "ui/gfx/linux/drm_util_linux.h"
#include "ui/gfx/overlay_priority_hint.h"
diff --git a/ui/ozone/platform/x11/test/x11_drag_drop_client_unittest.cc b/ui/ozone/platform/x11/test/x11_drag_drop_client_unittest.cc
index e4e915b8..6b66749 100644
--- a/ui/ozone/platform/x11/test/x11_drag_drop_client_unittest.cc
+++ b/ui/ozone/platform/x11/test/x11_drag_drop_client_unittest.cc
@@ -19,6 +19,7 @@
#include "base/test/task_environment.h"
#include "base/threading/thread_task_runner_handle.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkPath.h"
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/dragdrop/mojom/drag_drop_types.mojom-shared.h"
#include "ui/base/dragdrop/os_exchange_data.h"
diff --git a/ui/ozone/platform/x11/x11_topmost_window_finder_interactive_uitest.cc b/ui/ozone/platform/x11/x11_topmost_window_finder_interactive_uitest.cc
index 346a45e..b0b60f6 100644
--- a/ui/ozone/platform/x11/x11_topmost_window_finder_interactive_uitest.cc
+++ b/ui/ozone/platform/x11/x11_topmost_window_finder_interactive_uitest.cc
@@ -19,6 +19,7 @@
#include "ui/base/x/test/x11_property_change_waiter.h"
#include "ui/base/x/x11_util.h"
#include "ui/events/platform/x11/x11_event_source.h"
+#include "ui/gfx/geometry/transform.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/x/connection.h"
#include "ui/gfx/x/event.h"
diff --git a/ui/ozone/platform/x11/x11_window.cc b/ui/ozone/platform/x11/x11_window.cc
index 15b5f6f..8e096dc 100644
--- a/ui/ozone/platform/x11/x11_window.cc
+++ b/ui/ozone/platform/x11/x11_window.cc
@@ -34,6 +34,7 @@
#include "ui/events/x/events_x_utils.h"
#include "ui/events/x/x11_event_translation.h"
#include "ui/gfx/geometry/skia_conversions.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/x/x11_atom_cache.h"
#include "ui/gfx/x/x11_path.h"
#include "ui/gfx/x/x11_window_event_manager.h"
diff --git a/ui/snapshot/snapshot.cc b/ui/snapshot/snapshot.cc
index 92af3365..660a900 100644
--- a/ui/snapshot/snapshot.cc
+++ b/ui/snapshot/snapshot.cc
@@ -14,6 +14,7 @@
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/image/image_util.h"
namespace ui {
diff --git a/ui/views/controls/image_view.cc b/ui/views/controls/image_view.cc
index 0909f06..a0825bd 100644
--- a/ui/views/controls/image_view.cc
+++ b/ui/views/controls/image_view.cc
@@ -13,6 +13,7 @@
#include "skia/ext/image_operations.h"
#include "ui/base/metadata/metadata_impl_macros.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/native_theme/themed_vector_icon.h"
#include "ui/views/image_model_utils.h"
diff --git a/ui/views/drag_utils_mac.mm b/ui/views/drag_utils_mac.mm
index 256913a..83c1488 100644
--- a/ui/views/drag_utils_mac.mm
+++ b/ui/views/drag_utils_mac.mm
@@ -4,6 +4,8 @@
#include "ui/views/drag_utils.h"
+#include "base/notreached.h"
+
namespace views {
void RunShellDrag(gfx::NativeView view,
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h b/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
index 2c3bc9d..b5581344 100644
--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
@@ -16,6 +16,7 @@
#include "ui/base/dragdrop/mojom/drag_drop_types.mojom-shared.h"
#include "ui/base/dragdrop/os_exchange_data.h"
#include "ui/gfx/geometry/point_f.h"
+#include "ui/gfx/geometry/size.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/platform_window/wm/wm_drag_handler.h"
#include "ui/platform_window/wm/wm_drop_handler.h"
diff --git a/weblayer/browser/favicon/favicon_callback_proxy.cc b/weblayer/browser/favicon/favicon_callback_proxy.cc
index b1b8871..4bcd93e 100644
--- a/weblayer/browser/favicon/favicon_callback_proxy.cc
+++ b/weblayer/browser/favicon/favicon_callback_proxy.cc
@@ -8,6 +8,7 @@
#include "ui/gfx/android/java_bitmap.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "url/gurl.h"
#include "weblayer/browser/java/jni/FaviconCallbackProxy_jni.h"
#include "weblayer/browser/tab_impl.h"
diff --git a/weblayer/browser/profile_impl.cc b/weblayer/browser/profile_impl.cc
index 9f377e9..b514745 100644
--- a/weblayer/browser/profile_impl.cc
+++ b/weblayer/browser/profile_impl.cc
@@ -34,6 +34,7 @@
#include "services/network/public/mojom/network_context.mojom.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
#include "weblayer/browser/browser_context_impl.h"
#include "weblayer/browser/browser_impl.h"
#include "weblayer/browser/browser_list.h"
Reply all
Reply to author
Forward
0 new messages