Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3444)

Unified Diff: chrome/browser/ui/cocoa/browser_window_touch_bar.mm

Issue 2733823003: Move final vector icons out of ui/gfx/vector_icons/ and remove the (Closed)
Patch Set: fix deps Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser_window_touch_bar.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_touch_bar.mm b/chrome/browser/ui/cocoa/browser_window_touch_bar.mm
index d812ab1ad0045f6dadfe83c946904de5f2abd9b3..255b62dc51d0efadbbea70a104383fc4e0f44262 100644
--- a/chrome/browser/ui/cocoa/browser_window_touch_bar.mm
+++ b/chrome/browser/ui/cocoa/browser_window_touch_bar.mm
@@ -25,7 +25,6 @@
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia_util_mac.h"
#include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
#include "ui/vector_icons/vector_icons.h"
namespace {
@@ -193,11 +192,11 @@ NSButton* CreateTouchBarButton(const gfx::VectorIcon& icon,
NSImage* image;
if (isGoogle) {
image = NSImageFromImageSkiaWithColorSpace(
- gfx::CreateVectorIcon(gfx::VectorIconId::GOOGLE_SEARCH_MAC_TOUCHBAR,
- kTouchBarIconSize, gfx::kPlaceholderColor),
+ gfx::CreateVectorIcon(kGoogleSearchMacTouchbarIcon, kTouchBarIconSize,
+ gfx::kPlaceholderColor),
base::mac::GetSRGBColorSpace());
} else {
- image = CreateNSImageFromIcon(omnibox::kSearchIcon);
+ image = CreateNSImageFromIcon(ui::kSearchIcon);
}
NSButton* searchButton =
@@ -225,4 +224,4 @@ NSButton* CreateTouchBarButton(const gfx::VectorIcon& icon,
commandUpdater_->ExecuteCommand([sender tag]);
}
-@end
+@end

Powered by Google App Engine
This is Rietveld 408576698