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

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

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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) 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/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
9 #include "ui/events/event_constants.h" 10 #include "ui/events/event_constants.h"
10 #include "ui/gfx/animation/animation_delegate.h" 11 #include "ui/gfx/animation/animation_delegate.h"
11 #include "ui/views/animation/ink_drop_state.h" 12 #include "ui/views/animation/ink_drop_state.h"
12 #include "ui/views/controls/button/button.h" 13 #include "ui/views/controls/button/button.h"
13 14
14 namespace gfx { 15 namespace gfx {
15 class ThrobAnimation; 16 class ThrobAnimation;
16 } 17 }
17 18
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 // The animation action to trigger on the |ink_drop_delegate_| when the button 187 // The animation action to trigger on the |ink_drop_delegate_| when the button
187 // is clicked. 188 // is clicked.
188 InkDropState ink_drop_action_on_click_; 189 InkDropState ink_drop_action_on_click_;
189 190
190 DISALLOW_COPY_AND_ASSIGN(CustomButton); 191 DISALLOW_COPY_AND_ASSIGN(CustomButton);
191 }; 192 };
192 193
193 } // namespace views 194 } // namespace views
194 195
195 #endif // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ 196 #endif // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698