OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/views/autocomplete/autocomplete_popup_contents_view.h" | 5 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" |
6 | 6 |
7 #include "app/bidi_line_iterator.h" | 7 #include "app/bidi_line_iterator.h" |
8 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
9 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" |
10 #include "app/theme_provider.h" | 10 #include "app/theme_provider.h" |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 // The minimum distance between the top and bottom of the icon and the top or | 114 // The minimum distance between the top and bottom of the icon and the top or |
115 // bottom of the row. "Minimum" is used because the vertical padding may be | 115 // bottom of the row. "Minimum" is used because the vertical padding may be |
116 // larger, depending on the size of the text. | 116 // larger, depending on the size of the text. |
117 const int kIconVerticalPadding = 2; | 117 const int kIconVerticalPadding = 2; |
118 // The minimum distance between the top and bottom of the text and the top or | 118 // The minimum distance between the top and bottom of the text and the top or |
119 // bottom of the row. See comment about the use of "minimum" for | 119 // bottom of the row. See comment about the use of "minimum" for |
120 // kIconVerticalPadding. | 120 // kIconVerticalPadding. |
121 const int kTextVerticalPadding = 3; | 121 const int kTextVerticalPadding = 3; |
122 // The size delta between the font used for the edit and the result rows. Passed | 122 // The size delta between the font used for the edit and the result rows. Passed |
123 // to gfx::Font::DeriveFont. | 123 // to gfx::Font::DeriveFont. |
124 #if !defined(OS_CHROMEOS) | 124 #if defined(OS_CHROMEOS) && !defined(CROS_FONTS_USING_BCI) |
125 const int kEditFontAdjust = -1; | |
126 #else | |
127 // Don't adjust font on chromeos as it becomes too small. | 125 // Don't adjust font on chromeos as it becomes too small. |
128 const int kEditFontAdjust = 0; | 126 const int kEditFontAdjust = 0; |
| 127 #else |
| 128 const int kEditFontAdjust = -1; |
129 #endif | 129 #endif |
130 | 130 |
131 // Horizontal padding between the buttons on the opt in promo. | 131 // Horizontal padding between the buttons on the opt in promo. |
132 const int kOptInButtonPadding = 2; | 132 const int kOptInButtonPadding = 2; |
133 | 133 |
134 // Padding around the opt in view. | 134 // Padding around the opt in view. |
135 const int kOptInLeftPadding = 12; | 135 const int kOptInLeftPadding = 12; |
136 const int kOptInRightPadding = 10; | 136 const int kOptInRightPadding = 10; |
137 const int kOptInTopPadding = 6; | 137 const int kOptInTopPadding = 6; |
138 const int kOptInBottomPadding = 5; | 138 const int kOptInBottomPadding = 5; |
(...skipping 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1202 opt_in_view_ = NULL; | 1202 opt_in_view_ = NULL; |
1203 PromoCounter* counter = model_->profile()->GetInstantPromoCounter(); | 1203 PromoCounter* counter = model_->profile()->GetInstantPromoCounter(); |
1204 DCHECK(counter); | 1204 DCHECK(counter); |
1205 counter->Hide(); | 1205 counter->Hide(); |
1206 if (opt_in) { | 1206 if (opt_in) { |
1207 browser::ShowInstantConfirmDialogIfNecessary( | 1207 browser::ShowInstantConfirmDialogIfNecessary( |
1208 location_bar_->GetWindow()->GetNativeWindow(), model_->profile()); | 1208 location_bar_->GetWindow()->GetNativeWindow(), model_->profile()); |
1209 } | 1209 } |
1210 UpdatePopupAppearance(); | 1210 UpdatePopupAppearance(); |
1211 } | 1211 } |
OLD | NEW |