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

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

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix new usage of scale in FastShowPickler Created 7 years, 3 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 | « ui/native_theme/native_theme_base.cc ('k') | ui/views/controls/glow_hover_controller.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_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/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/base/layout.h"
10 #include "ui/gfx/image/image_skia.h" 11 #include "ui/gfx/image/image_skia.h"
11 #include "ui/views/controls/button/custom_button.h" 12 #include "ui/views/controls/button/custom_button.h"
12 13
13 namespace views { 14 namespace views {
14 15
15 // An image button. 16 // An image button.
16 17
17 // Note that this type of button is not focusable by default and will not be 18 // Note that this type of button is not focusable by default and will not be
18 // part of the focus chain. Call set_focusable(true) to make it part of the 19 // part of the focus chain. Call set_focusable(true) to make it part of the
19 // focus chain. 20 // focus chain.
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 // The parent class's tooltip_text_ is displayed when not toggled, and 144 // The parent class's tooltip_text_ is displayed when not toggled, and
144 // this one is shown when toggled. 145 // this one is shown when toggled.
145 string16 toggled_tooltip_text_; 146 string16 toggled_tooltip_text_;
146 147
147 DISALLOW_COPY_AND_ASSIGN(ToggleImageButton); 148 DISALLOW_COPY_AND_ASSIGN(ToggleImageButton);
148 }; 149 };
149 150
150 } // namespace views 151 } // namespace views
151 152
152 #endif // UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_ 153 #endif // UI_VIEWS_CONTROLS_BUTTON_IMAGE_BUTTON_H_
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_base.cc ('k') | ui/views/controls/glow_hover_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698