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

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

Issue 10829370: Make search icon in omnibox results hidpi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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_INLINE_OMNIBOX_POPUP_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_INLINE_OMNIBOX_POPUP_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_INLINE_OMNIBOX_POPUP_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_INLINE_OMNIBOX_POPUP_VIEW_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" 9 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
10 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" 10 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 virtual bool IsOpen() const OVERRIDE; 48 virtual bool IsOpen() const OVERRIDE;
49 virtual void InvalidateLine(size_t line) OVERRIDE; 49 virtual void InvalidateLine(size_t line) OVERRIDE;
50 virtual void UpdatePopupAppearance() OVERRIDE; 50 virtual void UpdatePopupAppearance() OVERRIDE;
51 virtual gfx::Rect GetTargetBounds() OVERRIDE; 51 virtual gfx::Rect GetTargetBounds() OVERRIDE;
52 virtual void PaintUpdatesNow() OVERRIDE; 52 virtual void PaintUpdatesNow() OVERRIDE;
53 virtual void OnDragCanceled() OVERRIDE; 53 virtual void OnDragCanceled() OVERRIDE;
54 54
55 // Overridden from OmniboxResultViewModel: 55 // Overridden from OmniboxResultViewModel:
56 virtual bool IsSelectedIndex(size_t index) const OVERRIDE; 56 virtual bool IsSelectedIndex(size_t index) const OVERRIDE;
57 virtual bool IsHoveredIndex(size_t index) const OVERRIDE; 57 virtual bool IsHoveredIndex(size_t index) const OVERRIDE;
58 virtual const SkBitmap* GetIconIfExtensionMatch(size_t index) const OVERRIDE; 58 virtual gfx::Image GetIconIfExtensionMatch(size_t index) const OVERRIDE;
59 59
60 // Overridden from ui::AnimationDelegate: 60 // Overridden from ui::AnimationDelegate:
61 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; 61 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
62 62
63 // Overridden from views::View: 63 // Overridden from views::View:
64 virtual gfx::Size GetPreferredSize() OVERRIDE; 64 virtual gfx::Size GetPreferredSize() OVERRIDE;
65 virtual void Layout() OVERRIDE; 65 virtual void Layout() OVERRIDE;
66 virtual views::View* GetEventHandlerForPoint( 66 virtual views::View* GetEventHandlerForPoint(
67 const gfx::Point& point) OVERRIDE; 67 const gfx::Point& point) OVERRIDE;
68 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 68 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 // shorter (not larger, that makes it look "slow"). 151 // shorter (not larger, that makes it look "slow").
152 ui::SlideAnimation size_animation_; 152 ui::SlideAnimation size_animation_;
153 // TODO(sky): convert to sizes. 153 // TODO(sky): convert to sizes.
154 gfx::Rect start_bounds_; 154 gfx::Rect start_bounds_;
155 gfx::Rect target_bounds_; 155 gfx::Rect target_bounds_;
156 156
157 DISALLOW_COPY_AND_ASSIGN(InlineOmniboxPopupView); 157 DISALLOW_COPY_AND_ASSIGN(InlineOmniboxPopupView);
158 }; 158 };
159 159
160 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_INLINE_OMNIBOX_POPUP_VIEW_H_ 160 #endif // CHROME_BROWSER_UI_VIEWS_OMNIBOX_INLINE_OMNIBOX_POPUP_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698