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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

Issue 2644903004: Move around more vector icons. (Closed)
Patch Set: fix comment Created 3 years, 11 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/omnibox/omnibox_popup_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
index b7c9ef5d0a1447234c01515dfdc1df422fef600c..40066e8d8a644a69e93db5089cc5d5421b048f9a 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
@@ -20,6 +20,7 @@
#include "components/omnibox/browser/autocomplete_match_type.h"
#include "components/omnibox/browser/omnibox_edit_model.h"
#include "components/omnibox/browser/omnibox_popup_model.h"
+#include "components/toolbar/vector_icons.h"
#include "skia/ext/skia_utils_mac.h"
#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
#import "ui/base/cocoa/cocoa_base_utils.h"
@@ -32,7 +33,6 @@
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
#include "ui/gfx/text_elider.h"
-#include "ui/gfx/vector_icons_public.h"
namespace {
@@ -332,13 +332,13 @@ NSImage* OmniboxPopupViewMac::ImageForMatch(
bool is_dark_mode = [matrix_ hasDarkTheme];
const SkColor icon_color =
is_dark_mode ? SkColorSetA(SK_ColorWHITE, 0xCC) : gfx::kChromeIconGrey;
- const gfx::VectorIconId vector_icon_id =
+ const gfx::VectorIcon& vector_icon =
model_->IsStarredMatch(match)
- ? gfx::VectorIconId::LOCATION_BAR_STAR
+ ? toolbar::kStarIcon
: AutocompleteMatch::TypeToVectorIcon(match.type);
const int kIconSize = 16;
return NSImageFromImageSkia(
- gfx::CreateVectorIcon(vector_icon_id, kIconSize, icon_color));
+ gfx::CreateVectorIcon(vector_icon, kIconSize, icon_color));
}
void OmniboxPopupViewMac::OpenURLForRow(size_t row,
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm ('k') | chrome/browser/ui/cocoa/profiles/avatar_icon_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698