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

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

Issue 25039002: Always aligns text at vertically center (Textfield, Label). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 7 years, 1 month 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 | Annotate | Revision Log
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.h" 10 #include "chrome/browser/search_engines/template_url_service.h"
11 #include "chrome/browser/search_engines/template_url_service_factory.h" 11 #include "chrome/browser/search_engines/template_url_service_factory.h"
12 #include "chrome/browser/ui/omnibox/location_bar_util.h" 12 #include "chrome/browser/ui/omnibox/location_bar_util.h"
13 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" 13 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
14 #include "grit/generated_resources.h" 14 #include "grit/generated_resources.h"
15 #include "grit/theme_resources.h" 15 #include "grit/theme_resources.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/views/painter.h" 17 #include "ui/views/painter.h"
18 18
19 19
20 namespace { 20 namespace {
21 const int kBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_SELECTED_KEYWORD_BUBBLE); 21 const int kBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_SELECTED_KEYWORD_BUBBLE);
22 } 22 }
23 23
24 24
25 SelectedKeywordView::SelectedKeywordView(const gfx::FontList& font_list, 25 SelectedKeywordView::SelectedKeywordView(const gfx::FontList& font_list,
26 int font_y_offset,
27 SkColor text_color, 26 SkColor text_color,
28 SkColor parent_background_color, 27 SkColor parent_background_color,
29 Profile* profile) 28 Profile* profile)
30 : IconLabelBubbleView(kBackgroundImages, NULL, IDR_KEYWORD_SEARCH_MAGNIFIER, 29 : IconLabelBubbleView(kBackgroundImages, NULL, IDR_KEYWORD_SEARCH_MAGNIFIER,
31 font_list, font_y_offset, text_color, 30 font_list, text_color, parent_background_color,
32 parent_background_color, false), 31 false),
33 profile_(profile) { 32 profile_(profile) {
34 full_label_.SetFontList(font_list); 33 full_label_.SetFontList(font_list);
35 full_label_.SetVisible(false); 34 full_label_.SetVisible(false);
36 partial_label_.SetFontList(font_list); 35 partial_label_.SetFontList(font_list);
37 partial_label_.SetVisible(false); 36 partial_label_.SetVisible(false);
38 } 37 }
39 38
40 SelectedKeywordView::~SelectedKeywordView() { 39 SelectedKeywordView::~SelectedKeywordView() {
41 } 40 }
42 41
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, short_name); 73 l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, short_name);
75 full_label_.SetText(full_name); 74 full_label_.SetText(full_name);
76 75
77 const string16 min_string(location_bar_util::CalculateMinString(short_name)); 76 const string16 min_string(location_bar_util::CalculateMinString(short_name));
78 const string16 partial_name = is_extension_keyword ? 77 const string16 partial_name = is_extension_keyword ?
79 min_string : 78 min_string :
80 l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, min_string); 79 l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, min_string);
81 partial_label_.SetText(min_string.empty() ? 80 partial_label_.SetText(min_string.empty() ?
82 full_label_.text() : partial_name); 81 full_label_.text() : partial_name);
83 } 82 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/selected_keyword_view.h ('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