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

Side by Side Diff: views/controls/button/native_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/native_button.h ('k') | views/controls/button/native_button_wrapper.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/native_button.h" 5 #include "views/controls/button/native_button.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "ui/base/keycodes/keyboard_codes.h" 8 #include "ui/base/keycodes/keyboard_codes.h"
9 #include "views/controls/native/native_view_host.h" 9 #include "views/controls/native/native_view_host.h"
10 10
11 #if defined(OS_WIN) 11 #if defined(OS_WIN)
12 #include "gfx/platform_font_win.h" 12 #include "ui/gfx/platform_font_win.h"
13 #elif defined(OS_LINUX) 13 #elif defined(OS_LINUX)
14 #include <gdk/gdkkeysyms.h> 14 #include <gdk/gdkkeysyms.h>
15 #include "views/screen.h" 15 #include "views/screen.h"
16 #endif 16 #endif
17 17
18 18
19 namespace views { 19 namespace views {
20 20
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 // The min size in DLUs comes from 22 // The min size in DLUs comes from
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 native_wrapper->UpdateEnabled(); 225 native_wrapper->UpdateEnabled();
226 return native_wrapper; 226 return native_wrapper;
227 } 227 }
228 228
229 void NativeButton::InitBorder() { 229 void NativeButton::InitBorder() {
230 set_border(Border::CreateEmptyBorder(0, kButtonBorderHWidth, 0, 230 set_border(Border::CreateEmptyBorder(0, kButtonBorderHWidth, 0,
231 kButtonBorderHWidth)); 231 kButtonBorderHWidth));
232 } 232 }
233 233
234 } // namespace views 234 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/button/native_button.h ('k') | views/controls/button/native_button_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698