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

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

Issue 1829353002: Fix padding in location bar bubbles to match specs on bug. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hide_background_later
Patch Set: New dependence Created 4 years, 8 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 95 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 }
116
117 int SelectedKeywordView::GetImageAndPaddingWidth() const {
118 int width = IconLabelBubbleView::GetImageAndPaddingWidth();
119 // Squeeze the icon and label closer to account for intrinsic padding in the
120 // icon.
121 if (ui::MaterialDesignController::IsModeMaterial())
122 width -= 3;
123
124 DCHECK_GE(width, 0);
125 return width;
126 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698