Chromium Code Reviews| 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 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "components/omnibox/browser/omnibox_popup_model.h" | 9 #include "components/omnibox/browser/omnibox_popup_model.h" |
| 10 #include "components/omnibox/browser/omnibox_popup_view.h" | 10 #include "components/omnibox/browser/omnibox_popup_view.h" |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 | 149 |
| 150 // The popup sizes vertically using an animation when the popup is getting | 150 // The popup sizes vertically using an animation when the popup is getting |
| 151 // shorter (not larger, that makes it look "slow"). | 151 // shorter (not larger, that makes it look "slow"). |
| 152 gfx::SlideAnimation size_animation_; | 152 gfx::SlideAnimation size_animation_; |
| 153 gfx::Rect start_bounds_; | 153 gfx::Rect start_bounds_; |
| 154 gfx::Rect target_bounds_; | 154 gfx::Rect target_bounds_; |
| 155 | 155 |
| 156 int start_margin_; | 156 int start_margin_; |
| 157 int end_margin_; | 157 int end_margin_; |
| 158 | 158 |
| 159 const gfx::ImageSkia* bottom_shadow_; // Ptr owned by resource bundle. | 159 const gfx::ImageSkia* bottom_shadow_; // Ptr owned by resource bundle. |
|
Peter Kasting
2015/08/27 19:05:04
Nit: Since there are now two of these, just write
tdanderson
2015/08/27 19:47:20
Done.
| |
| 160 const gfx::ImageSkia* top_shadow_; // Ptr owned by resource bundle. | |
|
Peter Kasting
2015/08/27 19:05:04
Tiny nit: Reverse these (and in the .cc file) sinc
tdanderson
2015/08/27 19:47:20
Done.
| |
| 160 | 161 |
| 161 // When the dropdown is not wide enough while displaying postfix suggestions, | 162 // When the dropdown is not wide enough while displaying postfix suggestions, |
| 162 // we use the width of widest match contents to shift the suggestions so that | 163 // we use the width of widest match contents to shift the suggestions so that |
| 163 // the widest suggestion just reaches the end edge. | 164 // the widest suggestion just reaches the end edge. |
| 164 int max_match_contents_width_; | 165 int max_match_contents_width_; |
| 165 | 166 |
| 166 DISALLOW_COPY_AND_ASSIGN(OmniboxPopupContentsView); | 167 DISALLOW_COPY_AND_ASSIGN(OmniboxPopupContentsView); |
| 167 }; | 168 }; |
| 168 | 169 |
| 169 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_ | 170 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_ |
| OLD | NEW |