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

Side by Side Diff: ui/views/controls/button/image_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 4 years, 12 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 (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_IMAGE_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
10 #include "ui/base/layout.h" 11 #include "ui/base/layout.h"
11 #include "ui/gfx/image/image_skia.h" 12 #include "ui/gfx/image/image_skia.h"
12 #include "ui/views/controls/button/custom_button.h" 13 #include "ui/views/controls/button/custom_button.h"
13 14
14 namespace views { 15 namespace views {
15 16
16 class Painter; 17 class Painter;
17 18
18 // An image button. 19 // An image button.
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // The parent class's tooltip_text_ is displayed when not toggled, and 162 // The parent class's tooltip_text_ is displayed when not toggled, and
162 // this one is shown when toggled. 163 // this one is shown when toggled.
163 base::string16 toggled_tooltip_text_; 164 base::string16 toggled_tooltip_text_;
164 165
165 DISALLOW_COPY_AND_ASSIGN(ToggleImageButton); 166 DISALLOW_COPY_AND_ASSIGN(ToggleImageButton);
166 }; 167 };
167 168
168 } // namespace views 169 } // namespace views
169 170
170 #endif // UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_ 171 #endif // UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698