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

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

Issue 2041033002: Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed merge conflict in custom_button.cc Created 4 years, 6 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_MD_TEXT_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ui/views/animation/button_ink_drop_delegate.h"
11 #include "ui/views/controls/button/label_button.h" 10 #include "ui/views/controls/button/label_button.h"
12 11
13 namespace views { 12 namespace views {
14 13
15 // A button class that implements the Material Design text button spec. 14 // A button class that implements the Material Design text button spec.
16 class VIEWS_EXPORT MdTextButton : public LabelButton { 15 class VIEWS_EXPORT MdTextButton : public LabelButton {
17 public: 16 public:
18 // Describes the presentation of a button. A stronger call to action draws 17 // Describes the presentation of a button. A stronger call to action draws
19 // more attention. 18 // more attention.
20 enum CallToAction { 19 enum CallToAction {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 63
65 // The call to action style for this button. 64 // The call to action style for this button.
66 CallToAction cta_; 65 CallToAction cta_;
67 66
68 DISALLOW_COPY_AND_ASSIGN(MdTextButton); 67 DISALLOW_COPY_AND_ASSIGN(MdTextButton);
69 }; 68 };
70 69
71 } // namespace views 70 } // namespace views
72 71
73 #endif // UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_ 72 #endif // UI_VIEWS_CONTROLS_BUTTON_MD_TEXT_BUTTON_H_
OLDNEW
« no previous file with comments | « ui/views/controls/button/label_button_unittest.cc ('k') | ui/views/controls/button/md_text_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698