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

Side by Side Diff: chrome/utility/chrome_content_utility_client.cc

Issue 1847173002: Revert "Revert of Remove font cache code (patchset #3 id:40001 of https://codereview.chromium.org/1… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add test expectations to rebaseline tests on Win10 Created 4 years, 8 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/common/chrome_utility_messages.h ('k') | chrome/utility/font_cache_handler_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) 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/utility/chrome_content_utility_client.h" 5 #include "chrome/utility/chrome_content_utility_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 26 matching lines...) Expand all
37 37
38 #if !defined(OS_ANDROID) 38 #if !defined(OS_ANDROID)
39 #include "chrome/common/resource_usage_reporter.mojom.h" 39 #include "chrome/common/resource_usage_reporter.mojom.h"
40 #include "chrome/utility/profile_import_handler.h" 40 #include "chrome/utility/profile_import_handler.h"
41 #include "mojo/public/cpp/bindings/strong_binding.h" 41 #include "mojo/public/cpp/bindings/strong_binding.h"
42 #include "net/proxy/mojo_proxy_resolver_factory_impl.h" 42 #include "net/proxy/mojo_proxy_resolver_factory_impl.h"
43 #include "net/proxy/proxy_resolver_v8.h" 43 #include "net/proxy/proxy_resolver_v8.h"
44 #endif 44 #endif
45 45
46 #if defined(OS_WIN) 46 #if defined(OS_WIN)
47 #include "chrome/utility/font_cache_handler_win.h"
48 #include "chrome/utility/shell_handler_win.h" 47 #include "chrome/utility/shell_handler_win.h"
49 #endif 48 #endif
50 49
51 #if defined(ENABLE_EXTENSIONS) 50 #if defined(ENABLE_EXTENSIONS)
52 #include "chrome/utility/extensions/extensions_handler.h" 51 #include "chrome/utility/extensions/extensions_handler.h"
53 #include "chrome/utility/image_writer/image_writer_handler.h" 52 #include "chrome/utility/image_writer/image_writer_handler.h"
54 #endif 53 #endif
55 54
56 #if defined(ENABLE_PRINT_PREVIEW) || defined(OS_WIN) 55 #if defined(ENABLE_PRINT_PREVIEW) || defined(OS_WIN)
57 #include "chrome/utility/printing_handler.h" 56 #include "chrome/utility/printing_handler.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 handlers_.push_back(new extensions::ExtensionsHandler(this)); 124 handlers_.push_back(new extensions::ExtensionsHandler(this));
126 handlers_.push_back(new image_writer::ImageWriterHandler()); 125 handlers_.push_back(new image_writer::ImageWriterHandler());
127 #endif 126 #endif
128 127
129 #if defined(ENABLE_PRINT_PREVIEW) || defined(OS_WIN) 128 #if defined(ENABLE_PRINT_PREVIEW) || defined(OS_WIN)
130 handlers_.push_back(new printing::PrintingHandler()); 129 handlers_.push_back(new printing::PrintingHandler());
131 #endif 130 #endif
132 131
133 #if defined(OS_WIN) 132 #if defined(OS_WIN)
134 handlers_.push_back(new ShellHandler()); 133 handlers_.push_back(new ShellHandler());
135 handlers_.push_back(new FontCacheHandler());
136 #endif 134 #endif
137 135
138 handlers_.push_back(new SafeJsonParserHandler()); 136 handlers_.push_back(new SafeJsonParserHandler());
139 } 137 }
140 138
141 ChromeContentUtilityClient::~ChromeContentUtilityClient() { 139 ChromeContentUtilityClient::~ChromeContentUtilityClient() {
142 } 140 }
143 141
144 void ChromeContentUtilityClient::UtilityThreadStarted() { 142 void ChromeContentUtilityClient::UtilityThreadStarted() {
145 #if defined(ENABLE_EXTENSIONS) 143 #if defined(ENABLE_EXTENSIONS)
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 safe_browsing::zip_analyzer::Results results; 405 safe_browsing::zip_analyzer::Results results;
408 safe_browsing::dmg::AnalyzeDMGFile( 406 safe_browsing::dmg::AnalyzeDMGFile(
409 IPC::PlatformFileForTransitToFile(dmg_file), &results); 407 IPC::PlatformFileForTransitToFile(dmg_file), &results);
410 Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished( 408 Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished(
411 results)); 409 results));
412 ReleaseProcessIfNeeded(); 410 ReleaseProcessIfNeeded();
413 } 411 }
414 #endif // defined(OS_MACOSX) 412 #endif // defined(OS_MACOSX)
415 413
416 #endif // defined(FULL_SAFE_BROWSING) 414 #endif // defined(FULL_SAFE_BROWSING)
OLDNEW
« no previous file with comments | « chrome/common/chrome_utility_messages.h ('k') | chrome/utility/font_cache_handler_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698