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

Side by Side Diff: views/controls/button/custom_button.h

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ 5 #ifndef VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
6 #define VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ 6 #define VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ui/base/animation/animation_delegate.h" 9 #include "ui/base/animation/animation_delegate.h"
10 #include "views/controls/button/button.h" 10 #include "views/controls/button/button.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 virtual std::string GetClassName() const OVERRIDE; 80 virtual std::string GetClassName() const OVERRIDE;
81 virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE; 81 virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE;
82 virtual bool OnMouseDragged(const MouseEvent& event) OVERRIDE; 82 virtual bool OnMouseDragged(const MouseEvent& event) OVERRIDE;
83 virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE; 83 virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE;
84 virtual void OnMouseCaptureLost() OVERRIDE; 84 virtual void OnMouseCaptureLost() OVERRIDE;
85 virtual void OnMouseEntered(const MouseEvent& event) OVERRIDE; 85 virtual void OnMouseEntered(const MouseEvent& event) OVERRIDE;
86 virtual void OnMouseExited(const MouseEvent& event) OVERRIDE; 86 virtual void OnMouseExited(const MouseEvent& event) OVERRIDE;
87 virtual void OnMouseMoved(const MouseEvent& event) OVERRIDE; 87 virtual void OnMouseMoved(const MouseEvent& event) OVERRIDE;
88 virtual bool OnKeyPressed(const KeyEvent& event) OVERRIDE; 88 virtual bool OnKeyPressed(const KeyEvent& event) OVERRIDE;
89 virtual bool OnKeyReleased(const KeyEvent& event) OVERRIDE; 89 virtual bool OnKeyReleased(const KeyEvent& event) OVERRIDE;
90 virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE; 90 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
91 virtual void ShowContextMenu(const gfx::Point& p, 91 virtual void ShowContextMenu(const gfx::Point& p,
92 bool is_mouse_gesture) OVERRIDE; 92 bool is_mouse_gesture) OVERRIDE;
93 virtual void OnDragDone() OVERRIDE; 93 virtual void OnDragDone() OVERRIDE;
94 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 94 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
95 95
96 // Overridden from ui::AnimationDelegate: 96 // Overridden from ui::AnimationDelegate:
97 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; 97 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
98 98
99 protected: 99 protected:
100 // Construct the Button with a Listener. See comment for Button's ctor. 100 // Construct the Button with a Listener. See comment for Button's ctor.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 // See description above setter. 141 // See description above setter.
142 bool request_focus_on_press_; 142 bool request_focus_on_press_;
143 143
144 DISALLOW_COPY_AND_ASSIGN(CustomButton); 144 DISALLOW_COPY_AND_ASSIGN(CustomButton);
145 }; 145 };
146 146
147 } // namespace views 147 } // namespace views
148 148
149 #endif // VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ 149 #endif // VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698