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

Side by Side Diff: chrome/browser/ui/webui/settings_utils_win.cc

Issue 2913253003: Convert Windows to use X509CertificateBytes. (Closed)
Patch Set: rebase Created 3 years, 6 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 | « chrome/browser/ui/views/certificate_viewer_win.cc ('k') | net/BUILD.gn » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/webui/settings_utils.h" 5 #include "chrome/browser/ui/webui/settings_utils.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <cryptuiapi.h>
9 #include <shellapi.h> 8 #include <shellapi.h>
10 9
11 #include "base/bind.h" 10 #include "base/bind.h"
12 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
13 #include "base/location.h" 12 #include "base/location.h"
14 #include "base/macros.h" 13 #include "base/macros.h"
15 #include "base/path_service.h" 14 #include "base/path_service.h"
16 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
17 #include "base/threading/thread.h" 16 #include "base/threading/thread.h"
18 #include "base/threading/thread_task_runner_handle.h" 17 #include "base/threading/thread_task_runner_handle.h"
19 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/ui/cryptuiapi_shim.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "ui/gfx/font.h" 22 #include "ui/gfx/font.h"
23 #include "ui/gfx/platform_font_win.h" 23 #include "ui/gfx/platform_font_win.h"
24 #include "ui/shell_dialogs/base_shell_dialog_win.h" 24 #include "ui/shell_dialogs/base_shell_dialog_win.h"
25 #include "ui/views/win/hwnd_util.h" 25 #include "ui/views/win/hwnd_util.h"
26 26
27 using content::BrowserThread; 27 using content::BrowserThread;
28 28
29 namespace settings_utils { 29 namespace settings_utils {
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 std::string MaybeGetLocalizedFontName(const std::string& font_name_or_list) { 117 std::string MaybeGetLocalizedFontName(const std::string& font_name_or_list) {
118 std::string font_name = ResolveFontList(font_name_or_list); 118 std::string font_name = ResolveFontList(font_name_or_list);
119 if (font_name.empty()) 119 if (font_name.empty())
120 return font_name; 120 return font_name;
121 gfx::Font font(font_name, 12); // dummy font size 121 gfx::Font font(font_name, 12); // dummy font size
122 return static_cast<gfx::PlatformFontWin*>(font.platform_font()) 122 return static_cast<gfx::PlatformFontWin*>(font.platform_font())
123 ->GetLocalizedFontName(); 123 ->GetLocalizedFontName();
124 } 124 }
125 125
126 } // namespace settings_utils 126 } // namespace settings_utils
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/certificate_viewer_win.cc ('k') | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698