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

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

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "components/content_settings/core/common/content_settings_types.h" 9 #include "components/content_settings/core/common/content_settings_types.h"
10 #include "ui/gfx/animation/animation_delegate.h" 10 #include "ui/gfx/animation/animation_delegate.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 static const int kAnimationDurationMS; 56 static const int kAnimationDurationMS;
57 57
58 // Amount of padding at the edges of the bubble. If |by_icon| is true, this 58 // Amount of padding at the edges of the bubble. If |by_icon| is true, this
59 // is the padding next to the icon; otherwise it's the padding next to the 59 // is the padding next to the icon; otherwise it's the padding next to the
60 // label. (We increase padding next to the label by the amount of padding 60 // label. (We increase padding next to the label by the amount of padding
61 // "built in" to the icon in order to make the bubble appear to have 61 // "built in" to the icon in order to make the bubble appear to have
62 // symmetrical padding.) 62 // symmetrical padding.)
63 static int GetBubbleOuterPadding(bool by_icon); 63 static int GetBubbleOuterPadding(bool by_icon);
64 64
65 // gfx::AnimationDelegate: 65 // gfx::AnimationDelegate:
66 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; 66 virtual void AnimationEnded(const gfx::Animation* animation) override;
67 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 67 virtual void AnimationProgressed(const gfx::Animation* animation) override;
68 virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE; 68 virtual void AnimationCanceled(const gfx::Animation* animation) override;
69 69
70 // views::View: 70 // views::View:
71 virtual gfx::Size GetPreferredSize() const OVERRIDE; 71 virtual gfx::Size GetPreferredSize() const override;
72 virtual void Layout() OVERRIDE; 72 virtual void Layout() override;
73 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 73 virtual bool OnMousePressed(const ui::MouseEvent& event) override;
74 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; 74 virtual void OnMouseReleased(const ui::MouseEvent& event) override;
75 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 75 virtual void OnGestureEvent(ui::GestureEvent* event) override;
76 virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; 76 virtual void OnPaintBackground(gfx::Canvas* canvas) override;
77 77
78 // views::WidgetObserver: 78 // views::WidgetObserver:
79 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; 79 virtual void OnWidgetDestroying(views::Widget* widget) override;
80 80
81 bool background_showing() const { 81 bool background_showing() const {
82 return slide_animator_.is_animating() || pause_animation_; 82 return slide_animator_.is_animating() || pause_animation_;
83 } 83 }
84 84
85 int GetTotalSpacingWhileAnimating() const; 85 int GetTotalSpacingWhileAnimating() const;
86 void OnClick(); 86 void OnClick();
87 87
88 LocationBarView* parent_; // Weak, owns us. 88 LocationBarView* parent_; // Weak, owns us.
89 scoped_ptr<ContentSettingImageModel> content_setting_image_model_; 89 scoped_ptr<ContentSettingImageModel> content_setting_image_model_;
90 scoped_ptr<views::Painter> background_painter_; 90 scoped_ptr<views::Painter> background_painter_;
91 views::ImageView* icon_; 91 views::ImageView* icon_;
92 views::Label* text_label_; 92 views::Label* text_label_;
93 gfx::SlideAnimation slide_animator_; 93 gfx::SlideAnimation slide_animator_;
94 bool pause_animation_; 94 bool pause_animation_;
95 double pause_animation_state_; 95 double pause_animation_state_;
96 views::Widget* bubble_widget_; 96 views::Widget* bubble_widget_;
97 97
98 DISALLOW_COPY_AND_ASSIGN(ContentSettingImageView); 98 DISALLOW_COPY_AND_ASSIGN(ContentSettingImageView);
99 }; 99 };
100 100
101 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ 101 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/bubble_icon_view.h ('k') | chrome/browser/ui/views/location_bar/ev_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698