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

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

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/custom_button.cc ('k') | views/controls/button/text_button.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) 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 "app/throb_animation.h"
8 #include "gfx/canvas.h" 7 #include "gfx/canvas.h"
9 #include "gfx/skbitmap_operations.h" 8 #include "gfx/skbitmap_operations.h"
9 #include "ui/base/animation/throb_animation.h"
10 10
11 namespace views { 11 namespace views {
12 12
13 static const int kDefaultWidth = 16; // Default button width if no theme. 13 static const int kDefaultWidth = 16; // Default button width if no theme.
14 static const int kDefaultHeight = 14; // Default button height if no theme. 14 static const int kDefaultHeight = 14; // Default button height if no theme.
15 15
16 //////////////////////////////////////////////////////////////////////////////// 16 ////////////////////////////////////////////////////////////////////////////////
17 // ImageButton, public: 17 // ImageButton, public:
18 18
19 ImageButton::ImageButton(ButtonListener* listener) 19 ImageButton::ImageButton(ButtonListener* listener)
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 bool ToggleImageButton::GetTooltipText(const gfx::Point& p, 164 bool ToggleImageButton::GetTooltipText(const gfx::Point& p,
165 std::wstring* tooltip) { 165 std::wstring* tooltip) {
166 if (!toggled_ || toggled_tooltip_text_.empty()) 166 if (!toggled_ || toggled_tooltip_text_.empty())
167 return Button::GetTooltipText(p, tooltip); 167 return Button::GetTooltipText(p, tooltip);
168 168
169 *tooltip = toggled_tooltip_text_; 169 *tooltip = toggled_tooltip_text_;
170 return true; 170 return true;
171 } 171 }
172 172
173 } // namespace views 173 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/button/custom_button.cc ('k') | views/controls/button/text_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698