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

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

Issue 1645013004: Views - dialog button defaultness shouldn't follow focus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix win compile Created 4 years, 10 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
« no previous file with comments | « no previous file | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/events/event_constants.h" 10 #include "ui/events/event_constants.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 bool OnMouseDragged(const ui::MouseEvent& event) override; 86 bool OnMouseDragged(const ui::MouseEvent& event) override;
87 void OnMouseReleased(const ui::MouseEvent& event) override; 87 void OnMouseReleased(const ui::MouseEvent& event) override;
88 void OnMouseCaptureLost() override; 88 void OnMouseCaptureLost() override;
89 void OnMouseEntered(const ui::MouseEvent& event) override; 89 void OnMouseEntered(const ui::MouseEvent& event) override;
90 void OnMouseExited(const ui::MouseEvent& event) override; 90 void OnMouseExited(const ui::MouseEvent& event) override;
91 void OnMouseMoved(const ui::MouseEvent& event) override; 91 void OnMouseMoved(const ui::MouseEvent& event) override;
92 bool OnKeyPressed(const ui::KeyEvent& event) override; 92 bool OnKeyPressed(const ui::KeyEvent& event) override;
93 bool OnKeyReleased(const ui::KeyEvent& event) override; 93 bool OnKeyReleased(const ui::KeyEvent& event) override;
94 void OnGestureEvent(ui::GestureEvent* event) override; 94 void OnGestureEvent(ui::GestureEvent* event) override;
95 bool AcceleratorPressed(const ui::Accelerator& accelerator) override; 95 bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
96 bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) override;
96 void ShowContextMenu(const gfx::Point& p, 97 void ShowContextMenu(const gfx::Point& p,
97 ui::MenuSourceType source_type) override; 98 ui::MenuSourceType source_type) override;
98 void OnDragDone() override; 99 void OnDragDone() override;
99 void GetAccessibleState(ui::AXViewState* state) override; 100 void GetAccessibleState(ui::AXViewState* state) override;
100 void VisibilityChanged(View* starting_from, bool is_visible) override; 101 void VisibilityChanged(View* starting_from, bool is_visible) override;
101 102
102 // Overridden from gfx::AnimationDelegate: 103 // Overridden from gfx::AnimationDelegate:
103 void AnimationProgressed(const gfx::Animation* animation) override; 104 void AnimationProgressed(const gfx::Animation* animation) override;
104 105
105 // Overridden from views::InkDropHost: 106 // Overridden from views::InkDropHost:
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 // The animation action to trigger on the |ink_drop_delegate_| when the button 198 // The animation action to trigger on the |ink_drop_delegate_| when the button
198 // is clicked. 199 // is clicked.
199 InkDropState ink_drop_action_on_click_; 200 InkDropState ink_drop_action_on_click_;
200 201
201 DISALLOW_COPY_AND_ASSIGN(CustomButton); 202 DISALLOW_COPY_AND_ASSIGN(CustomButton);
202 }; 203 };
203 204
204 } // namespace views 205 } // namespace views
205 206
206 #endif // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ 207 #endif // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698