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

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

Issue 1017323003: [AiS] adding content and answer line heights (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed comments Created 5 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_result_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_RESULT_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // gfx::AnimationDelegate: 149 // gfx::AnimationDelegate:
150 void AnimationProgressed(const gfx::Animation* animation) override; 150 void AnimationProgressed(const gfx::Animation* animation) override;
151 151
152 // Returns the offset at which the contents of the |match| should be displayed 152 // Returns the offset at which the contents of the |match| should be displayed
153 // within the text bounds. The directionality of UI and match contents is used 153 // within the text bounds. The directionality of UI and match contents is used
154 // to determine the offset relative to the correct edge. 154 // to determine the offset relative to the correct edge.
155 int GetDisplayOffset(const AutocompleteMatch& match, 155 int GetDisplayOffset(const AutocompleteMatch& match,
156 bool is_ui_rtl, 156 bool is_ui_rtl,
157 bool is_match_contents_rtl) const; 157 bool is_match_contents_rtl) const;
158 158
159 int GetAnswerLineHeight() const;
160 int GetContentLineHeight() const;
161
159 static int default_icon_size_; 162 static int default_icon_size_;
160 163
161 // Default values cached here, may be overridden using the setters above. 164 // Default values cached here, may be overridden using the setters above.
162 int edge_item_padding_; 165 int edge_item_padding_;
163 int item_padding_; 166 int item_padding_;
164 167
165 // This row's model and model index. 168 // This row's model and model index.
166 OmniboxPopupContentsView* model_; 169 OmniboxPopupContentsView* model_;
167 size_t model_index_; 170 size_t model_index_;
168 171
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 mutable scoped_ptr<gfx::RenderText> keyword_description_rendertext_; 204 mutable scoped_ptr<gfx::RenderText> keyword_description_rendertext_;
202 205
203 mutable int separator_width_; 206 mutable int separator_width_;
204 207
205 base::WeakPtrFactory<OmniboxResultView> weak_ptr_factory_; 208 base::WeakPtrFactory<OmniboxResultView> weak_ptr_factory_;
206 209
207 DISALLOW_COPY_AND_ASSIGN(OmniboxResultView); 210 DISALLOW_COPY_AND_ASSIGN(OmniboxResultView);
208 }; 211 };
209 212
210 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_ 213 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_result_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698