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

Side by Side Diff: chrome/browser/ui/views/location_bar/selected_keyword_view.cc

Issue 1406613002: For some vector icons, get the size from the vector definition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" 5 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/search_engines/template_url_service_factory.h" 10 #include "chrome/browser/search_engines/template_url_service_factory.h"
(...skipping 27 matching lines...) Expand all
38 full_label_.SetVisible(false); 38 full_label_.SetVisible(false);
39 partial_label_.SetFontList(font_list); 39 partial_label_.SetFontList(font_list);
40 partial_label_.SetVisible(false); 40 partial_label_.SetVisible(false);
41 } 41 }
42 42
43 SelectedKeywordView::~SelectedKeywordView() { 43 SelectedKeywordView::~SelectedKeywordView() {
44 } 44 }
45 45
46 void SelectedKeywordView::ResetImage() { 46 void SelectedKeywordView::ResetImage() {
47 if (ui::MaterialDesignController::IsModeMaterial()) { 47 if (ui::MaterialDesignController::IsModeMaterial()) {
48 SetImage(gfx::CreateVectorIcon(gfx::VectorIconId::KEYWORD_SEARCH, 16, 48 SetImage(gfx::CreateVectorIcon(gfx::VectorIconId::KEYWORD_SEARCH,
49 GetTextColor())); 49 GetTextColor()));
50 } else { 50 } else {
51 SetImage(*GetThemeProvider()->GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)); 51 SetImage(*GetThemeProvider()->GetImageSkiaNamed(IDR_OMNIBOX_SEARCH));
52 } 52 }
53 } 53 }
54 54
55 SkColor SelectedKeywordView::GetTextColor() const { 55 SkColor SelectedKeywordView::GetTextColor() const {
56 if (!ui::MaterialDesignController::IsModeMaterial()) 56 if (!ui::MaterialDesignController::IsModeMaterial())
57 return text_color_; 57 return text_color_;
58 58
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 const base::string16 partial_name = is_extension_keyword ? 106 const base::string16 partial_name = is_extension_keyword ?
107 min_string : 107 min_string :
108 l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, min_string); 108 l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, min_string);
109 partial_label_.SetText(min_string.empty() ? 109 partial_label_.SetText(min_string.empty() ?
110 full_label_.text() : partial_name); 110 full_label_.text() : partial_name);
111 } 111 }
112 112
113 const char* SelectedKeywordView::GetClassName() const { 113 const char* SelectedKeywordView::GetClassName() const {
114 return "SelectedKeywordView"; 114 return "SelectedKeywordView";
115 } 115 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698