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

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

Issue 795933009: [AiS] for desktop, two lines and font sytles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unnecessary include 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"
11 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h" 11 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h"
12 #include "components/omnibox/autocomplete_match.h" 12 #include "components/omnibox/autocomplete_match.h"
13 #include "components/omnibox/suggestion_answer.h"
13 #include "third_party/skia/include/core/SkColor.h" 14 #include "third_party/skia/include/core/SkColor.h"
14 #include "ui/gfx/animation/animation_delegate.h" 15 #include "ui/gfx/animation/animation_delegate.h"
15 #include "ui/gfx/animation/slide_animation.h" 16 #include "ui/gfx/animation/slide_animation.h"
16 #include "ui/gfx/font_list.h" 17 #include "ui/gfx/font_list.h"
17 #include "ui/gfx/geometry/rect.h" 18 #include "ui/gfx/geometry/rect.h"
18 #include "ui/views/controls/image_view.h" 19 #include "ui/views/controls/image_view.h"
19 #include "ui/views/view.h" 20 #include "ui/views/view.h"
20 21
21 class LocationBarView; 22 class LocationBarView;
22 class OmniboxPopupContentsView; 23 class OmniboxPopupContentsView;
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 // Returns the offset at which the contents of the |match| should be displayed 153 // 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 154 // within the text bounds. The directionality of UI and match contents is used
154 // to determine the offset relative to the correct edge. 155 // to determine the offset relative to the correct edge.
155 int GetDisplayOffset(const AutocompleteMatch& match, 156 int GetDisplayOffset(const AutocompleteMatch& match,
156 bool is_ui_rtl, 157 bool is_ui_rtl,
157 bool is_match_contents_rtl) const; 158 bool is_match_contents_rtl) const;
158 159
159 int GetAnswerLineHeight() const; 160 int GetAnswerLineHeight() const;
160 int GetContentLineHeight() const; 161 int GetContentLineHeight() const;
161 162
163 void AppendAnswerText(const SuggestionAnswer::TextField& text_field);
164
162 static int default_icon_size_; 165 static int default_icon_size_;
163 166
164 // Default values cached here, may be overridden using the setters above. 167 // Default values cached here, may be overridden using the setters above.
165 int edge_item_padding_; 168 int edge_item_padding_;
166 int item_padding_; 169 int item_padding_;
167 170
168 // This row's model and model index. 171 // This row's model and model index.
169 OmniboxPopupContentsView* model_; 172 OmniboxPopupContentsView* model_;
170 size_t model_index_; 173 size_t model_index_;
171 174
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 mutable scoped_ptr<gfx::RenderText> keyword_description_rendertext_; 207 mutable scoped_ptr<gfx::RenderText> keyword_description_rendertext_;
205 208
206 mutable int separator_width_; 209 mutable int separator_width_;
207 210
208 base::WeakPtrFactory<OmniboxResultView> weak_ptr_factory_; 211 base::WeakPtrFactory<OmniboxResultView> weak_ptr_factory_;
209 212
210 DISALLOW_COPY_AND_ASSIGN(OmniboxResultView); 213 DISALLOW_COPY_AND_ASSIGN(OmniboxResultView);
211 }; 214 };
212 215
213 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_ 216 #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