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

Unified Diff: chrome/browser/ui/views/autocomplete/autocomplete_result_view.h

Issue 9419043: Revert 122412 - Enabled pressing TAB to traverse through the Omnibox results (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/autocomplete/autocomplete_result_view.h
===================================================================
--- chrome/browser/ui/views/autocomplete/autocomplete_result_view.h (revision 122471)
+++ chrome/browser/ui/views/autocomplete/autocomplete_result_view.h (working copy)
@@ -8,21 +8,16 @@
#include "chrome/browser/autocomplete/autocomplete_match.h"
#include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
#include "ui/gfx/font.h"
#include "ui/gfx/rect.h"
-#include "ui/views/controls/image_view.h"
#include "ui/views/view.h"
class AutocompleteResultViewModel;
-
namespace gfx {
class Canvas;
}
-class AutocompleteResultView : public views::View,
- private ui::AnimationDelegate {
+class AutocompleteResultView : public views::View {
public:
enum ResultViewState {
NORMAL = 0,
@@ -52,13 +47,6 @@
// model has changed.
void SetMatch(const AutocompleteMatch& match);
- void ShowKeyword(bool show_keyword);
-
- void Invalidate();
-
- // views::View:
- virtual gfx::Size GetPreferredSize() OVERRIDE;
-
protected:
virtual void PaintMatch(gfx::Canvas* canvas,
const AutocompleteMatch& match,
@@ -94,7 +82,6 @@
ResultViewState GetState() const;
const SkBitmap* GetIcon() const;
- const SkBitmap* GetKeywordIcon() const;
// Elides |runs| to fit in |remaining_width|. The runs in |runs| should be in
// logical order.
@@ -113,13 +100,10 @@
void Elide(Runs* runs, int remaining_width) const;
// views::View:
+ virtual gfx::Size GetPreferredSize() OVERRIDE;
virtual void Layout() OVERRIDE;
- virtual void OnBoundsChanged(const gfx::Rect& previous_bounds);
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
- // ui::AnimationDelegate:
- virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-
static int default_icon_size_;
// This row's model and model index.
@@ -141,11 +125,6 @@
gfx::Rect text_bounds_;
gfx::Rect icon_bounds_;
- gfx::Rect keyword_text_bounds_;
- scoped_ptr<views::ImageView> keyword_icon_;
-
- scoped_ptr<ui::SlideAnimation> animation_;
-
DISALLOW_COPY_AND_ASSIGN(AutocompleteResultView);
};

Powered by Google App Engine
This is Rietveld 408576698