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

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

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 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 | 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"
(...skipping 21 matching lines...) Expand all
32 profile_(profile) { 32 profile_(profile) {
33 full_label_.SetFontList(font_list); 33 full_label_.SetFontList(font_list);
34 full_label_.SetVisible(false); 34 full_label_.SetVisible(false);
35 partial_label_.SetFontList(font_list); 35 partial_label_.SetFontList(font_list);
36 partial_label_.SetVisible(false); 36 partial_label_.SetVisible(false);
37 } 37 }
38 38
39 SelectedKeywordView::~SelectedKeywordView() { 39 SelectedKeywordView::~SelectedKeywordView() {
40 } 40 }
41 41
42 gfx::Size SelectedKeywordView::GetPreferredSize() { 42 gfx::Size SelectedKeywordView::GetPreferredSize() const {
43 // Height will be ignored by the LocationBarView. 43 // Height will be ignored by the LocationBarView.
44 return GetSizeForLabelWidth(full_label_.GetPreferredSize().width()); 44 return GetSizeForLabelWidth(full_label_.GetPreferredSize().width());
45 } 45 }
46 46
47 gfx::Size SelectedKeywordView::GetMinimumSize() { 47 gfx::Size SelectedKeywordView::GetMinimumSize() const {
48 // Height will be ignored by the LocationBarView. 48 // Height will be ignored by the LocationBarView.
49 return GetSizeForLabelWidth(partial_label_.GetMinimumSize().width()); 49 return GetSizeForLabelWidth(partial_label_.GetMinimumSize().width());
50 } 50 }
51 51
52 void SelectedKeywordView::Layout() { 52 void SelectedKeywordView::Layout() {
53 SetLabel(((width() == GetPreferredSize().width()) ? 53 SetLabel(((width() == GetPreferredSize().width()) ?
54 full_label_ : partial_label_).text()); 54 full_label_ : partial_label_).text());
55 IconLabelBubbleView::Layout(); 55 IconLabelBubbleView::Layout();
56 } 56 }
57 57
(...skipping 16 matching lines...) Expand all
74 full_label_.SetText(full_name); 74 full_label_.SetText(full_name);
75 75
76 const base::string16 min_string( 76 const base::string16 min_string(
77 location_bar_util::CalculateMinString(short_name)); 77 location_bar_util::CalculateMinString(short_name));
78 const base::string16 partial_name = is_extension_keyword ? 78 const base::string16 partial_name = is_extension_keyword ?
79 min_string : 79 min_string :
80 l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, min_string); 80 l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, min_string);
81 partial_label_.SetText(min_string.empty() ? 81 partial_label_.SetText(min_string.empty() ?
82 full_label_.text() : partial_name); 82 full_label_.text() : partial_name);
83 } 83 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/selected_keyword_view.h ('k') | chrome/browser/ui/views/menu_model_adapter_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698