views/controls/button/custom_button.h - Issue 6685069: Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

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

Issue 6685069: Disambiguate OnMouseCaptureLost from OnMouseReleased, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments, fix tests, cleanup, etc. Created 9 years, 9 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

« no previous file with comments | « views/controls/button/checkbox.cc ('k') | views/controls/button/custom_button.cc » ('j') | no next file with comments »

OLD	NEW
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 "views/controls/button/button.h"	9 #include "views/controls/button/button.h"

10 #include "ui/base/animation/animation_delegate.h"	10 #include "ui/base/animation/animation_delegate.h"

(...skipping 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 bool IsMouseHovered() const;	73 bool IsMouseHovered() const;

74	74

75 // Overridden from View:	75 // Overridden from View:

76 virtual void SetHotTracked(bool flag) OVERRIDE;	76 virtual void SetHotTracked(bool flag) OVERRIDE;

77 virtual bool IsHotTracked() const OVERRIDE;	77 virtual bool IsHotTracked() const OVERRIDE;

78 virtual void SetEnabled(bool enabled) OVERRIDE;	78 virtual void SetEnabled(bool enabled) OVERRIDE;

79 virtual bool IsEnabled() const OVERRIDE;	79 virtual bool IsEnabled() const OVERRIDE;

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, bool canceled) OVERRIDE;	83 virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE;

	84 virtual void OnMouseCaptureLost() OVERRIDE;

84 virtual void OnMouseEntered(const MouseEvent& event) OVERRIDE;	85 virtual void OnMouseEntered(const MouseEvent& event) OVERRIDE;

85 virtual void OnMouseExited(const MouseEvent& event) OVERRIDE;	86 virtual void OnMouseExited(const MouseEvent& event) OVERRIDE;

86 virtual void OnMouseMoved(const MouseEvent& event) OVERRIDE;	87 virtual void OnMouseMoved(const MouseEvent& event) OVERRIDE;

87 virtual bool OnKeyPressed(const KeyEvent& event) OVERRIDE;	88 virtual bool OnKeyPressed(const KeyEvent& event) OVERRIDE;

88 virtual bool OnKeyReleased(const KeyEvent& event) OVERRIDE;	89 virtual bool OnKeyReleased(const KeyEvent& event) OVERRIDE;

89 virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE;	90 virtual bool AcceleratorPressed(const Accelerator& accelerator) OVERRIDE;

90 virtual void ShowContextMenu(const gfx::Point& p,	91 virtual void ShowContextMenu(const gfx::Point& p,

91 bool is_mouse_gesture) OVERRIDE;	92 bool is_mouse_gesture) OVERRIDE;

92 virtual void OnDragDone() OVERRIDE;	93 virtual void OnDragDone() OVERRIDE;

93 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;	94 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
133	134

134 // See description above setter.	135 // See description above setter.

135 bool request_focus_on_press_;	136 bool request_focus_on_press_;

136	137

137 DISALLOW_COPY_AND_ASSIGN(CustomButton);	138 DISALLOW_COPY_AND_ASSIGN(CustomButton);

138 };	139 };

139	140

140 } // namespace views	141 } // namespace views

141	142

142 #endif // VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_	143 #endif // VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_

OLD	NEW