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

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

Issue 1132006: 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/window/dialog_client_view.h ('k') | views/window/window.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/window/dialog_client_view.h" 5 #include "views/window/dialog_client_view.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <uxtheme.h> 9 #include <uxtheme.h>
10 #include <vsstyle.h> 10 #include <vsstyle.h>
11 #else 11 #else
12 #include <gtk/gtk.h> 12 #include <gtk/gtk.h>
13 #endif 13 #endif
14 14
15 #include <algorithm> 15 #include <algorithm>
16 16
17 #include "app/gfx/canvas.h"
18 #include "app/gfx/font.h"
19 #include "app/l10n_util.h" 17 #include "app/l10n_util.h"
20 #include "app/resource_bundle.h" 18 #include "app/resource_bundle.h"
21 #include "base/keyboard_codes.h" 19 #include "base/keyboard_codes.h"
20 #include "gfx/canvas.h"
21 #include "gfx/font.h"
22 #include "grit/app_strings.h" 22 #include "grit/app_strings.h"
23 #include "views/controls/button/native_button.h" 23 #include "views/controls/button/native_button.h"
24 #include "views/standard_layout.h" 24 #include "views/standard_layout.h"
25 #include "views/window/dialog_delegate.h" 25 #include "views/window/dialog_delegate.h"
26 #include "views/window/window.h" 26 #include "views/window/window.h"
27 27
28 #if defined(OS_WIN) 28 #if defined(OS_WIN)
29 #include "gfx/native_theme_win.h" 29 #include "gfx/native_theme_win.h"
30 #else 30 #else
31 #include "gfx/skia_utils_gtk.h" 31 #include "gfx/skia_utils_gtk.h"
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 void DialogClientView::InitClass() { 562 void DialogClientView::InitClass() {
563 static bool initialized = false; 563 static bool initialized = false;
564 if (!initialized) { 564 if (!initialized) {
565 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 565 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
566 dialog_button_font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont)); 566 dialog_button_font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont));
567 initialized = true; 567 initialized = true;
568 } 568 }
569 } 569 }
570 570
571 } // namespace views 571 } // namespace views
OLDNEW
« no previous file with comments | « views/window/dialog_client_view.h ('k') | views/window/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698