| OLD | NEW |
| 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 Loading... |
| 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, | 48 SetImage(gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_SEARCH, |
| 49 16, |
| 49 GetTextColor())); | 50 GetTextColor())); |
| 50 } else { | 51 } else { |
| 51 SetImage(*GetThemeProvider()->GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)); | 52 SetImage(*GetThemeProvider()->GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)); |
| 52 } | 53 } |
| 53 } | 54 } |
| 54 | 55 |
| 55 SkColor SelectedKeywordView::GetTextColor() const { | 56 SkColor SelectedKeywordView::GetTextColor() const { |
| 56 if (!ui::MaterialDesignController::IsModeMaterial()) | 57 if (!ui::MaterialDesignController::IsModeMaterial()) |
| 57 return text_color_; | 58 return text_color_; |
| 58 | 59 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 const base::string16 partial_name = | 110 const base::string16 partial_name = |
| 110 is_extension_keyword ? min_string : l10n_util::GetStringFUTF16( | 111 is_extension_keyword ? min_string : l10n_util::GetStringFUTF16( |
| 111 keyword_text_id, min_string); | 112 keyword_text_id, min_string); |
| 112 partial_label_.SetText(min_string.empty() ? | 113 partial_label_.SetText(min_string.empty() ? |
| 113 full_label_.text() : partial_name); | 114 full_label_.text() : partial_name); |
| 114 } | 115 } |
| 115 | 116 |
| 116 const char* SelectedKeywordView::GetClassName() const { | 117 const char* SelectedKeywordView::GetClassName() const { |
| 117 return "SelectedKeywordView"; | 118 return "SelectedKeywordView"; |
| 118 } | 119 } |
| OLD | NEW |