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

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

Issue 113441: ChromeFont->gfx::Font... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 7 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
« no previous file with comments | « views/window/dialog_client_view.h ('k') | views/window/window_win.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #include <windows.h> 7 #include <windows.h>
8 #include <uxtheme.h> 8 #include <uxtheme.h>
9 #include <vsstyle.h> 9 #include <vsstyle.h>
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 private: 70 private:
71 Window* owner_; 71 Window* owner_;
72 const MessageBoxFlags::DialogButton type_; 72 const MessageBoxFlags::DialogButton type_;
73 73
74 DISALLOW_COPY_AND_ASSIGN(DialogButton); 74 DISALLOW_COPY_AND_ASSIGN(DialogButton);
75 }; 75 };
76 76
77 } // namespace 77 } // namespace
78 78
79 // static 79 // static
80 ChromeFont* DialogClientView::dialog_button_font_ = NULL; 80 gfx::Font* DialogClientView::dialog_button_font_ = NULL;
81 static const int kDialogMinButtonWidth = 75; 81 static const int kDialogMinButtonWidth = 75;
82 static const int kDialogButtonLabelSpacing = 16; 82 static const int kDialogButtonLabelSpacing = 16;
83 static const int kDialogButtonContentSpacing = 5; 83 static const int kDialogButtonContentSpacing = 5;
84 84
85 // The group used by the buttons. This name is chosen voluntarily big not to 85 // The group used by the buttons. This name is chosen voluntarily big not to
86 // conflict with other groups that could be in the dialog content. 86 // conflict with other groups that could be in the dialog content.
87 static const int kButtonGroup = 6666; 87 static const int kButtonGroup = 6666;
88 88
89 /////////////////////////////////////////////////////////////////////////////// 89 ///////////////////////////////////////////////////////////////////////////////
90 // DialogClientView, public: 90 // DialogClientView, public:
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 DialogDelegate* dd = window()->GetDelegate()->AsDialogDelegate(); 445 DialogDelegate* dd = window()->GetDelegate()->AsDialogDelegate();
446 DCHECK(dd); 446 DCHECK(dd);
447 return dd; 447 return dd;
448 } 448 }
449 449
450 // static 450 // static
451 void DialogClientView::InitClass() { 451 void DialogClientView::InitClass() {
452 static bool initialized = false; 452 static bool initialized = false;
453 if (!initialized) { 453 if (!initialized) {
454 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 454 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
455 dialog_button_font_ = new ChromeFont(rb.GetFont(ResourceBundle::BaseFont)); 455 dialog_button_font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont));
456 initialized = true; 456 initialized = true;
457 } 457 }
458 } 458 }
459 459
460 } // namespace views 460 } // namespace views
OLDNEW
« no previous file with comments | « views/window/dialog_client_view.h ('k') | views/window/window_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698