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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h

Issue 1306873006: Fix mac_views_browser=1 compile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 5 years, 3 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 #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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 // These pointers are owned by the resource bundle. 159 // These pointers are owned by the resource bundle.
160 const gfx::ImageSkia* top_shadow_; 160 const gfx::ImageSkia* top_shadow_ = nullptr;
161 const gfx::ImageSkia* bottom_shadow_; 161 const gfx::ImageSkia* bottom_shadow_ = nullptr;
162 162
163 // When the dropdown is not wide enough while displaying postfix suggestions, 163 // When the dropdown is not wide enough while displaying postfix suggestions,
164 // we use the width of widest match contents to shift the suggestions so that 164 // we use the width of widest match contents to shift the suggestions so that
165 // the widest suggestion just reaches the end edge. 165 // the widest suggestion just reaches the end edge.
166 int max_match_contents_width_; 166 int max_match_contents_width_;
167 167
168 DISALLOW_COPY_AND_ASSIGN(OmniboxPopupContentsView); 168 DISALLOW_COPY_AND_ASSIGN(OmniboxPopupContentsView);
169 }; 169 };
170 170
171 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_ 171 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_utils.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698