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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (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/menu_button.cc ('k') | views/controls/combobox/native_combobox_win.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/text_button.h" 5 #include "views/controls/button/text_button.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "app/resource_bundle.h"
10 #include "base/logging.h" 9 #include "base/logging.h"
11 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
12 #include "gfx/canvas_skia.h" 11 #include "gfx/canvas_skia.h"
13 #include "ui/base/animation/throb_animation.h" 12 #include "ui/base/animation/throb_animation.h"
13 #include "ui/base/resource/resource_bundle.h"
14 #include "views/controls/button/button.h" 14 #include "views/controls/button/button.h"
15 #include "views/event.h" 15 #include "views/event.h"
16 #include "grit/app_resources.h" 16 #include "grit/app_resources.h"
17 17
18 namespace views { 18 namespace views {
19 19
20 // Default space between the icon and text. 20 // Default space between the icon and text.
21 static const int kDefaultIconTextSpacing = 5; 21 static const int kDefaultIconTextSpacing = 5;
22 22
23 // Preferred padding between text and edge 23 // Preferred padding between text and edge
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 455
456 std::string TextButton::GetClassName() const { 456 std::string TextButton::GetClassName() const {
457 return kViewClassName; 457 return kViewClassName;
458 } 458 }
459 459
460 void TextButton::Paint(gfx::Canvas* canvas) { 460 void TextButton::Paint(gfx::Canvas* canvas) {
461 Paint(canvas, false); 461 Paint(canvas, false);
462 } 462 }
463 463
464 } // namespace views 464 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/button/menu_button.cc ('k') | views/controls/combobox/native_combobox_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698