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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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/radio_button.cc ('k') | views/controls/combobox/combobox.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/logging.h" 9 #include "base/logging.h"
10 #include "grit/ui_resources.h" 10 #include "grit/ui_resources.h"
11 #include "ui/base/animation/throb_animation.h" 11 #include "ui/base/animation/throb_animation.h"
12 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/gfx/canvas_skia.h" 13 #include "ui/gfx/canvas_skia.h"
14 #include "ui/views/events/event.h" 14 #include "ui/views/events/event.h"
15 #include "ui/views/widget/widget.h"
15 #include "views/controls/button/button.h" 16 #include "views/controls/button/button.h"
16 #include "views/widget/widget.h"
17 17
18 #if defined(OS_WIN) 18 #if defined(OS_WIN)
19 #include "skia/ext/skia_utils_win.h" 19 #include "skia/ext/skia_utils_win.h"
20 #include "ui/gfx/native_theme_win.h" 20 #include "ui/gfx/native_theme_win.h"
21 #include "ui/gfx/platform_font_win.h" 21 #include "ui/gfx/platform_font_win.h"
22 #endif 22 #endif
23 23
24 namespace views { 24 namespace views {
25 25
26 #if defined(OS_WIN) 26 #if defined(OS_WIN)
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 #endif 851 #endif
852 } 852 }
853 853
854 void NativeTextButton::GetExtraParams( 854 void NativeTextButton::GetExtraParams(
855 gfx::NativeTheme::ExtraParams* params) const { 855 gfx::NativeTheme::ExtraParams* params) const {
856 TextButton::GetExtraParams(params); 856 TextButton::GetExtraParams(params);
857 params->button.has_border = true; 857 params->button.has_border = true;
858 } 858 }
859 859
860 } // namespace views 860 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/button/radio_button.cc ('k') | views/controls/combobox/combobox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698