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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/star_decoration.mm

Issue 2644903004: Move around more vector icons. (Closed)
Patch Set: fix comment Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h" 5 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
6 6
7 #include "chrome/app/chrome_command_ids.h" 7 #include "chrome/app/chrome_command_ids.h"
8 #include "chrome/browser/command_updater.h" 8 #include "chrome/browser/command_updater.h"
9 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" 9 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
10 #import "chrome/browser/ui/cocoa/themed_window.h" 10 #import "chrome/browser/ui/cocoa/themed_window.h"
11 #include "chrome/grit/generated_resources.h" 11 #include "chrome/grit/generated_resources.h"
12 #include "chrome/grit/theme_resources.h" 12 #include "chrome/grit/theme_resources.h"
13 #include "components/strings/grit/components_strings.h" 13 #include "components/strings/grit/components_strings.h"
14 #include "components/toolbar/vector_icons.h"
14 #include "ui/base/l10n/l10n_util_mac.h" 15 #include "ui/base/l10n/l10n_util_mac.h"
15 #include "ui/base/material_design/material_design_controller.h" 16 #include "ui/base/material_design/material_design_controller.h"
16 #include "ui/gfx/color_palette.h" 17 #include "ui/gfx/color_palette.h"
17 18
18 namespace { 19 namespace {
19 20
20 // The info-bubble point should look like it points to the point 21 // The info-bubble point should look like it points to the point
21 // between the star's lower tips. The popup should be where the 22 // between the star's lower tips. The popup should be where the
22 // Omnibox popup ends up (2px below field). Determined via Pixie.app 23 // Omnibox popup ends up (2px below field). Determined via Pixie.app
23 // magnification. 24 // magnification.
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 return tooltip_.get(); 61 return tooltip_.get();
61 } 62 }
62 63
63 SkColor StarDecoration::GetMaterialIconColor(bool location_bar_is_dark) const { 64 SkColor StarDecoration::GetMaterialIconColor(bool location_bar_is_dark) const {
64 if (location_bar_is_dark) { 65 if (location_bar_is_dark) {
65 return starred_ ? gfx::kGoogleBlue300 : SkColorSetA(SK_ColorWHITE, 0xCC); 66 return starred_ ? gfx::kGoogleBlue300 : SkColorSetA(SK_ColorWHITE, 0xCC);
66 } 67 }
67 return starred_ ? gfx::kGoogleBlue500 : gfx::kChromeIconGrey; 68 return starred_ ? gfx::kGoogleBlue500 : gfx::kChromeIconGrey;
68 } 69 }
69 70
70 gfx::VectorIconId StarDecoration::GetMaterialVectorIconId() const { 71 const gfx::VectorIcon* StarDecoration::GetMaterialVectorIcon() const {
71 return starred_ ? gfx::VectorIconId::LOCATION_BAR_STAR_ACTIVE 72 return starred_ ? &toolbar::kStarActiveIcon : &toolbar::kStarIcon;
72 : gfx::VectorIconId::LOCATION_BAR_STAR;
73 } 73 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/star_decoration.h ('k') | chrome/browser/ui/cocoa/location_bar/translate_decoration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698