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

Side by Side Diff: chrome/browser/ui/views/location_bar/content_setting_image_view.h

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 13 matching lines...) Expand all
24 class WebContents; 24 class WebContents;
25 } 25 }
26 26
27 namespace views { 27 namespace views {
28 class GestureEvent; 28 class GestureEvent;
29 class MouseEvent; 29 class MouseEvent;
30 } 30 }
31 31
32 namespace ui { 32 namespace ui {
33 class SlideAnimation; 33 class SlideAnimation;
34 enum GestureStatus;
35 } 34 }
36 35
37 class ContentSettingsDelegateView; 36 class ContentSettingsDelegateView;
38 37
39 class ContentSettingImageView : public views::ImageView, 38 class ContentSettingImageView : public views::ImageView,
40 public ui::AnimationDelegate, 39 public ui::AnimationDelegate,
41 public views::WidgetObserver, 40 public views::WidgetObserver,
42 public TouchableLocationBarView { 41 public TouchableLocationBarView {
43 public: 42 public:
44 ContentSettingImageView(ContentSettingsType content_type, 43 ContentSettingImageView(ContentSettingsType content_type,
45 const int background_images[], 44 const int background_images[],
46 LocationBarView* parent); 45 LocationBarView* parent);
47 virtual ~ContentSettingImageView(); 46 virtual ~ContentSettingImageView();
48 47
49 // |new_navigation| true if this is a new navigation, false if the tab was 48 // |new_navigation| true if this is a new navigation, false if the tab was
50 // just switched to. 49 // just switched to.
51 virtual void Update(TabContents* tab_contents); 50 virtual void Update(TabContents* tab_contents);
52 51
53 // views::View overrides: 52 // views::View overrides:
54 virtual gfx::Size GetPreferredSize() OVERRIDE; 53 virtual gfx::Size GetPreferredSize() OVERRIDE;
55 virtual ui::GestureStatus OnGestureEvent( 54 virtual ui::EventResult OnGestureEvent(
56 const ui::GestureEvent& event) OVERRIDE; 55 const ui::GestureEvent& event) OVERRIDE;
57 56
58 // ui::AnimationDelegate overrides: 57 // ui::AnimationDelegate overrides:
59 virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; 58 virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
60 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; 59 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
61 virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE; 60 virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE;
62 61
63 // views::WidgetObserver override: 62 // views::WidgetObserver override:
64 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; 63 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
65 64
(...skipping 22 matching lines...) Expand all
88 string16 animated_text_; 87 string16 animated_text_;
89 bool pause_animation_; 88 bool pause_animation_;
90 int text_size_; 89 int text_size_;
91 int visible_text_size_; 90 int visible_text_size_;
92 views::HorizontalPainter background_painter_; 91 views::HorizontalPainter background_painter_;
93 92
94 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingImageView); 93 DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingImageView);
95 }; 94 };
96 95
97 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ 96 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698