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

Side by Side Diff: chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_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_TOUCH_OMNIBOX_POPUP_CONTENTS_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_TOUCH_OMNIBOX_POPUP_CONTENTS_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_TOUCH_OMNIBOX_POPUP_CONTENTS_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_TOUCH_OMNIBOX_POPUP_CONTENTS_VIEW_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" 9 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
10 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" 10 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h"
11 11
12 class OmniboxEditModel; 12 class OmniboxEditModel;
13 class OmniboxView; 13 class OmniboxView;
14 14
15 namespace gfx { 15 namespace gfx {
16 class Canvas; 16 class Canvas;
17 } 17 }
18 18
19 namespace views { 19 namespace views {
20 class View; 20 class View;
21 } 21 }
22 22
23 class TouchOmniboxResultView : public OmniboxResultView { 23 class TouchOmniboxResultView : public OmniboxResultView {
24 public: 24 public:
25 TouchOmniboxResultView(OmniboxResultViewModel* model, 25 TouchOmniboxResultView(OmniboxResultViewModel* model,
26 int model_index, 26 int model_index,
27 views::View* location_bar,
27 const gfx::Font& font); 28 const gfx::Font& font);
28 29
29 private: 30 private:
30 virtual ~TouchOmniboxResultView(); 31 virtual ~TouchOmniboxResultView();
31 32
32 // OmniboxResultView: 33 // OmniboxResultView:
33 virtual void PaintMatch(gfx::Canvas* canvas, 34 virtual void PaintMatch(gfx::Canvas* canvas,
34 const AutocompleteMatch& match, 35 const AutocompleteMatch& match,
35 int x) OVERRIDE; 36 int x) OVERRIDE;
36 virtual int GetTextHeight() const OVERRIDE; 37 virtual int GetTextHeight() const OVERRIDE;
(...skipping 20 matching lines...) Expand all
57 int model_index, 58 int model_index,
58 const gfx::Font& font) OVERRIDE; 59 const gfx::Font& font) OVERRIDE;
59 60
60 private: 61 private:
61 std::vector<View*> GetVisibleChildren(); 62 std::vector<View*> GetVisibleChildren();
62 63
63 DISALLOW_COPY_AND_ASSIGN(TouchOmniboxPopupContentsView); 64 DISALLOW_COPY_AND_ASSIGN(TouchOmniboxPopupContentsView);
64 }; 65 };
65 66
66 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_TOUCH_OMNIBOX_POPUP_CONTENTS_VIEW_H_ 67 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_TOUCH_OMNIBOX_POPUP_CONTENTS_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698