OLD | NEW |
---|---|
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 ASH_LAUNCHER_LAUNCHER_BUTTON_H_ | 5 #ifndef ASH_LAUNCHER_LAUNCHER_BUTTON_H_ |
6 #define ASH_LAUNCHER_LAUNCHER_BUTTON_H_ | 6 #define ASH_LAUNCHER_LAUNCHER_BUTTON_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "ui/views/controls/button/custom_button.h" | 10 #include "ui/views/controls/button/custom_button.h" |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
75 | 75 |
76 private: | 76 private: |
77 // Set to non-zero to force icons to be resized to fit within a square, | 77 // Set to non-zero to force icons to be resized to fit within a square, |
78 // while maintaining original proportions. | 78 // while maintaining original proportions. |
79 int icon_size_; | 79 int icon_size_; |
80 | 80 |
81 DISALLOW_COPY_AND_ASSIGN(IconView); | 81 DISALLOW_COPY_AND_ASSIGN(IconView); |
82 }; | 82 }; |
83 | 83 |
84 // View overrides: | 84 // View overrides: |
85 virtual ui::GestureStatus OnGestureEvent(const views::GestureEvent& event) | |
86 OVERRIDE; | |
flackr
2012/07/05 14:11:12
In general I think we try to order these in the sa
Kevin Greer
2012/07/05 18:35:04
Done.
| |
85 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; | 87 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; |
86 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; | 88 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; |
87 virtual void OnMouseCaptureLost() OVERRIDE; | 89 virtual void OnMouseCaptureLost() OVERRIDE; |
88 virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE; | 90 virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE; |
89 virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE; | 91 virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE; |
90 virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE; | 92 virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE; |
91 virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE; | 93 virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE; |
92 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; | 94 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; |
93 virtual void Layout() OVERRIDE; | 95 virtual void Layout() OVERRIDE; |
94 virtual void OnFocus() OVERRIDE; | 96 virtual void OnFocus() OVERRIDE; |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
127 // has a STATE_PENDING bit and destroyed when that bit is clear. | 129 // has a STATE_PENDING bit and destroyed when that bit is clear. |
128 scoped_ptr<IconPulseAnimation> icon_pulse_animation_; | 130 scoped_ptr<IconPulseAnimation> icon_pulse_animation_; |
129 | 131 |
130 DISALLOW_COPY_AND_ASSIGN(LauncherButton); | 132 DISALLOW_COPY_AND_ASSIGN(LauncherButton); |
131 }; | 133 }; |
132 | 134 |
133 } // namespace internal | 135 } // namespace internal |
134 } // namespace ash | 136 } // namespace ash |
135 | 137 |
136 #endif // ASH_LAUNCHER_LAUNCHER_BUTTON_H_ | 138 #endif // ASH_LAUNCHER_LAUNCHER_BUTTON_H_ |
OLD | NEW |