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

Side by Side Diff: views/controls/button/image_button.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « views/controls/button/checkbox.cc ('k') | views/controls/button/menu_button.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "views/controls/button/image_button.h" 5 #include "views/controls/button/image_button.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "gfx/canvas.h"
9 #include "gfx/skbitmap_operations.h"
10 #include "ui/base/animation/throb_animation.h" 8 #include "ui/base/animation/throb_animation.h"
9 #include "ui/gfx/canvas.h"
10 #include "ui/gfx/skbitmap_operations.h"
11 11
12 namespace views { 12 namespace views {
13 13
14 static const int kDefaultWidth = 16; // Default button width if no theme. 14 static const int kDefaultWidth = 16; // Default button width if no theme.
15 static const int kDefaultHeight = 14; // Default button height if no theme. 15 static const int kDefaultHeight = 14; // Default button height if no theme.
16 16
17 //////////////////////////////////////////////////////////////////////////////// 17 ////////////////////////////////////////////////////////////////////////////////
18 // ImageButton, public: 18 // ImageButton, public:
19 19
20 ImageButton::ImageButton(ButtonListener* listener) 20 ImageButton::ImageButton(ButtonListener* listener)
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 bool ToggleImageButton::GetTooltipText(const gfx::Point& p, 165 bool ToggleImageButton::GetTooltipText(const gfx::Point& p,
166 std::wstring* tooltip) { 166 std::wstring* tooltip) {
167 if (!toggled_ || toggled_tooltip_text_.empty()) 167 if (!toggled_ || toggled_tooltip_text_.empty())
168 return Button::GetTooltipText(p, tooltip); 168 return Button::GetTooltipText(p, tooltip);
169 169
170 *tooltip = UTF16ToWideHack(toggled_tooltip_text_); 170 *tooltip = UTF16ToWideHack(toggled_tooltip_text_);
171 return true; 171 return true;
172 } 172 }
173 173
174 } // namespace views 174 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/button/checkbox.cc ('k') | views/controls/button/menu_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698