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

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

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/native_button_wrapper.h ('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 #ifndef VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_ 5 #ifndef VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
6 #define VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_ 6 #define VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 // TODO(avi): remove when not needed 11 // TODO(avi): remove when not needed
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "gfx/font.h"
14 #include "third_party/skia/include/core/SkBitmap.h" 13 #include "third_party/skia/include/core/SkBitmap.h"
15 #include "third_party/skia/include/core/SkColor.h" 14 #include "third_party/skia/include/core/SkColor.h"
15 #include "ui/gfx/font.h"
16 #include "views/border.h" 16 #include "views/border.h"
17 #include "views/controls/button/custom_button.h" 17 #include "views/controls/button/custom_button.h"
18 18
19 namespace views { 19 namespace views {
20 20
21 //////////////////////////////////////////////////////////////////////////////// 21 ////////////////////////////////////////////////////////////////////////////////
22 // 22 //
23 // TextButtonBorder 23 // TextButtonBorder
24 // 24 //
25 // A Border subclass that paints a TextButton's background layer - 25 // A Border subclass that paints a TextButton's background layer -
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 242
243 // Space between icon and text. 243 // Space between icon and text.
244 int icon_text_spacing_; 244 int icon_text_spacing_;
245 245
246 DISALLOW_COPY_AND_ASSIGN(TextButton); 246 DISALLOW_COPY_AND_ASSIGN(TextButton);
247 }; 247 };
248 248
249 } // namespace views 249 } // namespace views
250 250
251 #endif // VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_ 251 #endif // VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
OLDNEW
« no previous file with comments | « views/controls/button/native_button_wrapper.h ('k') | views/controls/button/text_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698