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

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

Issue 14270006: linux_aura: Use the correct tinted icons when in gtk+ theme mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
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 "chrome/browser/autocomplete/autocomplete_match.h" 10 #include "chrome/browser/autocomplete/autocomplete_match.h"
(...skipping 28 matching lines...) Expand all
39 BACKGROUND = 0, 39 BACKGROUND = 0,
40 TEXT, 40 TEXT,
41 DIMMED_TEXT, 41 DIMMED_TEXT,
42 URL, 42 URL,
43 DIVIDER, 43 DIVIDER,
44 NUM_KINDS 44 NUM_KINDS
45 }; 45 };
46 46
47 OmniboxResultView(OmniboxResultViewModel* model, 47 OmniboxResultView(OmniboxResultViewModel* model,
48 int model_index, 48 int model_index,
49 views::View* location_bar,
49 const gfx::Font& font); 50 const gfx::Font& font);
50 virtual ~OmniboxResultView(); 51 virtual ~OmniboxResultView();
51 52
52 SkColor GetColor(ResultViewState state, ColorKind kind) const; 53 SkColor GetColor(ResultViewState state, ColorKind kind) const;
53 54
54 // Updates the match used to paint the contents of this result view. We copy 55 // Updates the match used to paint the contents of this result view. We copy
55 // the match so that we can continue to paint the last result even after the 56 // the match so that we can continue to paint the last result even after the
56 // model has changed. 57 // model has changed.
57 void SetMatch(const AutocompleteMatch& match); 58 void SetMatch(const AutocompleteMatch& match);
58 59
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 138
138 // Default values cached here, may be overridden using the setters above. 139 // Default values cached here, may be overridden using the setters above.
139 int edge_item_padding_; 140 int edge_item_padding_;
140 int item_padding_; 141 int item_padding_;
141 int minimum_text_vertical_padding_; 142 int minimum_text_vertical_padding_;
142 143
143 // This row's model and model index. 144 // This row's model and model index.
144 OmniboxResultViewModel* model_; 145 OmniboxResultViewModel* model_;
145 size_t model_index_; 146 size_t model_index_;
146 147
148 views::View* location_bar_;
149
147 const gfx::Font font_; 150 const gfx::Font font_;
148 int font_height_; 151 int font_height_;
149 152
150 // Width of the ellipsis in the normal font. 153 // Width of the ellipsis in the normal font.
151 int ellipsis_width_; 154 int ellipsis_width_;
152 155
153 // A context used for mirroring regions. 156 // A context used for mirroring regions.
154 class MirroringContext; 157 class MirroringContext;
155 scoped_ptr<MirroringContext> mirroring_context_; 158 scoped_ptr<MirroringContext> mirroring_context_;
156 159
157 AutocompleteMatch match_; 160 AutocompleteMatch match_;
158 161
159 gfx::Rect text_bounds_; 162 gfx::Rect text_bounds_;
160 gfx::Rect icon_bounds_; 163 gfx::Rect icon_bounds_;
161 164
162 gfx::Rect keyword_text_bounds_; 165 gfx::Rect keyword_text_bounds_;
163 scoped_ptr<views::ImageView> keyword_icon_; 166 scoped_ptr<views::ImageView> keyword_icon_;
164 167
165 scoped_ptr<ui::SlideAnimation> animation_; 168 scoped_ptr<ui::SlideAnimation> animation_;
166 169
167 DISALLOW_COPY_AND_ASSIGN(OmniboxResultView); 170 DISALLOW_COPY_AND_ASSIGN(OmniboxResultView);
168 }; 171 };
169 172
170 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_ 173 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_result_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698