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

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

Issue 2389073004: Restore correct size for omnibox search icon. (Closed)
Patch Set: . Created 4 years, 2 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 "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/search_engines/template_url_service_factory.h" 9 #include "chrome/browser/search_engines/template_url_service_factory.h"
10 #include "chrome/browser/ui/location_bar/location_bar_util.h" 10 #include "chrome/browser/ui/location_bar/location_bar_util.h"
11 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
11 #include "chrome/grit/generated_resources.h" 12 #include "chrome/grit/generated_resources.h"
12 #include "components/search_engines/template_url_service.h" 13 #include "components/search_engines/template_url_service.h"
13 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
14 #include "ui/base/theme_provider.h" 15 #include "ui/base/theme_provider.h"
15 #include "ui/gfx/color_palette.h" 16 #include "ui/gfx/color_palette.h"
16 #include "ui/gfx/color_utils.h" 17 #include "ui/gfx/color_utils.h"
17 #include "ui/gfx/paint_vector_icon.h" 18 #include "ui/gfx/paint_vector_icon.h"
18 #include "ui/gfx/vector_icons_public.h" 19 #include "ui/gfx/vector_icons_public.h"
19 #include "ui/native_theme/native_theme.h" 20 #include "ui/native_theme/native_theme.h"
20 21
21 SelectedKeywordView::SelectedKeywordView(const gfx::FontList& font_list, 22 SelectedKeywordView::SelectedKeywordView(const gfx::FontList& font_list,
22 Profile* profile) 23 Profile* profile)
23 : IconLabelBubbleView(font_list, false), profile_(profile) { 24 : IconLabelBubbleView(font_list, false), profile_(profile) {
24 full_label_.SetFontList(font_list); 25 full_label_.SetFontList(font_list);
25 full_label_.SetVisible(false); 26 full_label_.SetVisible(false);
26 partial_label_.SetFontList(font_list); 27 partial_label_.SetFontList(font_list);
27 partial_label_.SetVisible(false); 28 partial_label_.SetVisible(false);
28 } 29 }
29 30
30 SelectedKeywordView::~SelectedKeywordView() { 31 SelectedKeywordView::~SelectedKeywordView() {
31 } 32 }
32 33
33 void SelectedKeywordView::ResetImage() { 34 void SelectedKeywordView::ResetImage() {
34 SetImage( 35 SetImage(gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_SEARCH,
35 gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_SEARCH, GetTextColor())); 36 LocationBarView::kIconWidth, GetTextColor()));
36 } 37 }
37 38
38 SkColor SelectedKeywordView::GetTextColor() const { 39 SkColor SelectedKeywordView::GetTextColor() const {
39 return GetNativeTheme()->GetSystemColor( 40 return GetNativeTheme()->GetSystemColor(
40 color_utils::IsDark(GetParentBackgroundColor()) 41 color_utils::IsDark(GetParentBackgroundColor())
41 ? ui::NativeTheme::kColorId_TextfieldDefaultColor 42 ? ui::NativeTheme::kColorId_TextfieldDefaultColor
42 : ui::NativeTheme::kColorId_LinkEnabled); 43 : ui::NativeTheme::kColorId_LinkEnabled);
43 } 44 }
44 45
45 gfx::Size SelectedKeywordView::GetPreferredSize() const { 46 gfx::Size SelectedKeywordView::GetPreferredSize() const {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 89
89 // Update the label now so ShouldShowLabel() works correctly when the parent 90 // Update the label now so ShouldShowLabel() works correctly when the parent
90 // class is calculating the preferred size. It will be updated again in 91 // class is calculating the preferred size. It will be updated again in
91 // Layout(), taking into account how much space has actually been allotted. 92 // Layout(), taking into account how much space has actually been allotted.
92 SetLabel(full_name); 93 SetLabel(full_name);
93 } 94 }
94 95
95 const char* SelectedKeywordView::GetClassName() const { 96 const char* SelectedKeywordView::GetClassName() const {
96 return "SelectedKeywordView"; 97 return "SelectedKeywordView";
97 } 98 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_result_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698