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

Unified Diff: chrome/browser/ui/cocoa/location_bar/translate_decoration.mm

Issue 1821823004: [Mac][Material Design] Update Omnibox dropdown on Mac to MD (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clean up for review. Created 4 years, 8 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/location_bar/translate_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm b/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm
index 11e5b3ddd95c974d463f50c27d0c688aabda45e3..3f2a13f025c03a39cfe27d0a5525656f911d8487 100644
--- a/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm
@@ -23,19 +23,21 @@ TranslateDecoration::TranslateDecoration(CommandUpdater* command_updater)
TranslateDecoration::~TranslateDecoration() {}
-void TranslateDecoration::SetLit(bool on, bool locationBarIsDark) {
- if (ui::MaterialDesignController::IsModeMaterial()) {
- SkColor vectorIconColor = locationBarIsDark ? SK_ColorWHITE
- : gfx::kChromeIconGrey;
- NSImage* theImage =
- NSImageFromImageSkia(gfx::CreateVectorIcon(gfx::VectorIconId::TRANSLATE,
- 16,
- vectorIconColor));
- SetImage(theImage);
- } else {
+void TranslateDecoration::SetLit(bool on, bool location_bar_is_dark) {
+ if (!ui::MaterialDesignController::IsModeMaterial()) {
const int image_id = on ? IDR_TRANSLATE_ACTIVE : IDR_TRANSLATE;
SetImage(OmniboxViewMac::ImageForResource(image_id));
+ return;
}
+ SkColor vector_icon_color;
+ vector_icon_color = location_bar_is_dark ? SkColorSetA(SK_ColorWHITE, 0xCC)
tapted 2016/04/28 14:29:44 This 0xCC appears in a few places, so does kIconSi
+ : gfx::kChromeIconGrey;
+ const int kIconSize = 16;
+ NSImage* theImage =
+ NSImageFromImageSkia(gfx::CreateVectorIcon(gfx::VectorIconId::TRANSLATE,
+ kIconSize,
+ vector_icon_color));
+ SetImage(theImage);
}
NSPoint TranslateDecoration::GetBubblePointInFrame(NSRect frame) {

Powered by Google App Engine
This is Rietveld 408576698