@@ -9,10 +9,10 @@ don't get errors for Chrome's generated resources, which are non-existent
9
9
because we don't generate them in our build.
10
10
11
11
diff --git a/chrome/browser/ui/views/overlay/close_image_button.cc b/chrome/browser/ui/views/overlay/close_image_button.cc
12
- index 1a0c7f5f204f00b52747ebb7800b39a3479f1178..52a1b350c8b5a13b4c0636b43f4773b72872f025 100644
12
+ index 0d38b25bcb43f0bbedc1e71508e840a862c28a3c..94a36af528dfa220cfae6b9b1b0be1318502311b 100644
13
13
--- a/chrome/browser/ui/views/overlay/close_image_button.cc
14
14
+++ b/chrome/browser/ui/views/overlay/close_image_button.cc
15
- @@ -4,11 +4,14 @@
15
+ @@ -4,10 +4,13 @@
16
16
17
17
#include "chrome/browser/ui/views/overlay/close_image_button.h"
18
18
@@ -21,20 +21,19 @@ index 1a0c7f5f204f00b52747ebb7800b39a3479f1178..52a1b350c8b5a13b4c0636b43f4773b7
21
21
#include "chrome/browser/ui/color/chrome_color_id.h"
22
22
#include "chrome/grit/generated_resources.h"
23
23
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
24
- #include "components/omnibox/browser/omnibox_field_trial.h"
25
24
#include "components/vector_icons/vector_icons.h"
26
25
+ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
27
26
#include "ui/base/l10n/l10n_util.h"
28
27
#include "ui/base/metadata/metadata_impl_macros.h"
29
28
#include "ui/base/models/image_model.h"
30
- @@ -28,9 +31,11 @@ CloseImageButton::CloseImageButton(PressedCallback callback)
29
+ @@ -26,7 +29,10 @@ CloseImageButton::CloseImageButton(PressedCallback callback)
30
+ : OverlayWindowImageButton(std::move(callback)) {
31
31
SetSize(gfx::Size(kCloseButtonSize, kCloseButtonSize));
32
32
33
- auto* icon = &views::kIcCloseIcon;
33
+ - auto* icon = &vector_icons::kCloseChromeRefreshIcon;
34
+ + auto* icon = &views::kIcCloseIcon;
34
35
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
35
- if (OmniboxFieldTrial::IsChromeRefreshIconsEnabled()) {
36
- icon = &vector_icons::kCloseChromeRefreshIcon;
37
- }
36
+ + icon = &vector_icons::kCloseChromeRefreshIcon;
38
37
+ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
39
38
SetImageModel(views::Button::STATE_NORMAL,
40
39
ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground,
0 commit comments