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

Side by Side Diff: content/renderer/renderer_main_platform_delegate_win.cc

Issue 11734021: Roll ICU and convert include style to standard Chromium style, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « content/renderer/hyphenator/hyphenator.cc ('k') | content/zygote/zygote_main_linux.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) 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 "content/renderer/renderer_main_platform_delegate.h" 5 #include "content/renderer/renderer_main_platform_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
11 #include "base/win/win_util.h" 11 #include "base/win/win_util.h"
12 #include "content/public/common/content_switches.h" 12 #include "content/public/common/content_switches.h"
13 #include "content/public/common/injection_test_win.h" 13 #include "content/public/common/injection_test_win.h"
14 #include "content/public/renderer/render_thread.h" 14 #include "content/public/renderer/render_thread.h"
15 #include "content/renderer/render_thread_impl.h" 15 #include "content/renderer/render_thread_impl.h"
16 #include "sandbox/win/src/sandbox.h" 16 #include "sandbox/win/src/sandbox.h"
17 #include "skia/ext/skia_sandbox_support_win.h" 17 #include "skia/ext/skia_sandbox_support_win.h"
18 #include "skia/ext/vector_platform_device_emf_win.h" 18 #include "skia/ext/vector_platform_device_emf_win.h"
19 #include "unicode/timezone.h" 19 #include "third_party/icu/public/i18n/unicode/timezone.h"
20 20
21 namespace content { 21 namespace content {
22 namespace { 22 namespace {
23 23
24 // Windows-only skia sandbox support 24 // Windows-only skia sandbox support
25 void SkiaPreCacheFont(const LOGFONT& logfont) { 25 void SkiaPreCacheFont(const LOGFONT& logfont) {
26 RenderThread* render_thread = RenderThread::Get(); 26 RenderThread* render_thread = RenderThread::Get();
27 if (render_thread) { 27 if (render_thread) {
28 render_thread->PreCacheFont(logfont); 28 render_thread->PreCacheFont(logfont);
29 } 29 }
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 if (run_security_tests) { 135 if (run_security_tests) {
136 int test_count = 0; 136 int test_count = 0;
137 DVLOG(1) << "Running renderer security tests"; 137 DVLOG(1) << "Running renderer security tests";
138 BOOL result = run_security_tests(&test_count); 138 BOOL result = run_security_tests(&test_count);
139 CHECK(result) << "Test number " << test_count << " has failed."; 139 CHECK(result) << "Test number " << test_count << " has failed.";
140 } 140 }
141 } 141 }
142 } 142 }
143 143
144 } // namespace content 144 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/hyphenator/hyphenator.cc ('k') | content/zygote/zygote_main_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698