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

Side by Side Diff: views/window/custom_frame_view.cc

Issue 1117009: Move app/gfx/canvas* and app/gfx/font* to gfx/.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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/widget/widget_win.cc ('k') | views/window/dialog_client_view.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/window/custom_frame_view.h" 5 #include "views/window/custom_frame_view.h"
6 6
7 #include "app/gfx/canvas.h"
8 #include "app/gfx/font.h"
9 #include "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
10 #include "app/theme_provider.h" 8 #include "app/theme_provider.h"
11 #if defined(OS_WIN) 9 #if defined(OS_WIN)
12 #include "app/win_util.h" 10 #include "app/win_util.h"
13 #include "base/win_util.h" 11 #include "base/win_util.h"
14 #endif 12 #endif
13 #include "gfx/canvas.h"
14 #include "gfx/font.h"
15 #include "gfx/path.h" 15 #include "gfx/path.h"
16 #include "grit/app_resources.h" 16 #include "grit/app_resources.h"
17 #include "views/window/client_view.h" 17 #include "views/window/client_view.h"
18 #if defined(OS_LINUX) 18 #if defined(OS_LINUX)
19 #include "views/window/hit_test.h" 19 #include "views/window/hit_test.h"
20 #endif 20 #endif
21 #include "views/window/window_delegate.h" 21 #include "views/window/window_delegate.h"
22 22
23 namespace views { 23 namespace views {
24 24
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 title_font_ = new gfx::Font(win_util::GetWindowTitleFont()); 570 title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
571 #elif defined(OS_LINUX) 571 #elif defined(OS_LINUX)
572 // TODO: need to resolve what font this is. 572 // TODO: need to resolve what font this is.
573 title_font_ = new gfx::Font(); 573 title_font_ = new gfx::Font();
574 #endif 574 #endif
575 initialized = true; 575 initialized = true;
576 } 576 }
577 } 577 }
578 578
579 } // namespace views 579 } // namespace views
OLDNEW
« no previous file with comments | « views/widget/widget_win.cc ('k') | views/window/dialog_client_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698