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

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: Address feedback. 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..740bcb115b7ba3ce1dd88f1f7ebe4a40d03a1ccc 100644
--- a/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm
@@ -11,10 +11,6 @@
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/material_design/material_design_controller.h"
-#include "ui/gfx/color_palette.h"
-#include "ui/gfx/image/image_skia_util_mac.h"
-#include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
TranslateDecoration::TranslateDecoration(CommandUpdater* command_updater)
: command_updater_(command_updater) {
@@ -23,19 +19,13 @@ 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;
}
+ SetImage(GetMaterialIcon(location_bar_is_dark));
}
NSPoint TranslateDecoration::GetBubblePointInFrame(NSRect frame) {
@@ -55,3 +45,7 @@ bool TranslateDecoration::OnMousePressed(NSRect frame, NSPoint location) {
NSString* TranslateDecoration::GetToolTip() {
return l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_TRANSLATE);
}
+
+gfx::VectorIconId TranslateDecoration::GetMaterialVectorIconId() {
+ return gfx::VectorIconId::TRANSLATE;
+}

Powered by Google App Engine
This is Rietveld 408576698