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

Side by Side Diff: app/win_util.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 | « app/win_util.h ('k') | chrome/browser/autocomplete/autocomplete_edit_view_win.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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 "app/win_util.h" 5 #include "app/win_util.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlapp.h> 8 #include <atlapp.h>
9 #include <commdlg.h> 9 #include <commdlg.h>
10 #include <dwmapi.h> 10 #include <dwmapi.h>
(...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 text_ptr = localized_text.c_str(); 806 text_ptr = localized_text.c_str();
807 807
808 std::wstring localized_caption; 808 std::wstring localized_caption;
809 const wchar_t* caption_ptr = caption.c_str(); 809 const wchar_t* caption_ptr = caption.c_str();
810 if (l10n_util::AdjustStringForLocaleDirection(caption, &localized_caption)) 810 if (l10n_util::AdjustStringForLocaleDirection(caption, &localized_caption))
811 caption_ptr = localized_caption.c_str(); 811 caption_ptr = localized_caption.c_str();
812 812
813 return ::MessageBox(hwnd, text_ptr, caption_ptr, actual_flags); 813 return ::MessageBox(hwnd, text_ptr, caption_ptr, actual_flags);
814 } 814 }
815 815
816 ChromeFont GetWindowTitleFont() { 816 gfx::Font GetWindowTitleFont() {
817 NONCLIENTMETRICS ncm; 817 NONCLIENTMETRICS ncm;
818 win_util::GetNonClientMetrics(&ncm); 818 win_util::GetNonClientMetrics(&ncm);
819 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont)); 819 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
820 ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont))); 820 ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
821 return ChromeFont::CreateFont(caption_font); 821 return gfx::Font::CreateFont(caption_font);
822 } 822 }
823 823
824 } // namespace win_util 824 } // namespace win_util
OLDNEW
« no previous file with comments | « app/win_util.h ('k') | chrome/browser/autocomplete/autocomplete_edit_view_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698