OLD | NEW |
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 20 matching lines...) Expand all Loading... |
31 | 31 |
32 #if !defined(OS_ANDROID) | 32 #if !defined(OS_ANDROID) |
33 #include "chrome/common/resource_usage_reporter.mojom.h" | 33 #include "chrome/common/resource_usage_reporter.mojom.h" |
34 #include "chrome/utility/profile_import_handler.h" | 34 #include "chrome/utility/profile_import_handler.h" |
35 #include "mojo/public/cpp/bindings/strong_binding.h" | 35 #include "mojo/public/cpp/bindings/strong_binding.h" |
36 #include "net/proxy/mojo_proxy_resolver_factory_impl.h" | 36 #include "net/proxy/mojo_proxy_resolver_factory_impl.h" |
37 #include "net/proxy/proxy_resolver_v8.h" | 37 #include "net/proxy/proxy_resolver_v8.h" |
38 #endif | 38 #endif |
39 | 39 |
40 #if defined(OS_WIN) | 40 #if defined(OS_WIN) |
| 41 #include "chrome/utility/ipc_shell_handler_win.h" |
41 #include "chrome/utility/shell_handler_impl_win.h" | 42 #include "chrome/utility/shell_handler_impl_win.h" |
42 #endif | 43 #endif |
43 | 44 |
44 #if defined(ENABLE_EXTENSIONS) | 45 #if defined(ENABLE_EXTENSIONS) |
45 #include "chrome/utility/extensions/extensions_handler.h" | 46 #include "chrome/utility/extensions/extensions_handler.h" |
46 #include "chrome/utility/image_writer/image_writer_handler.h" | 47 #include "chrome/utility/image_writer/image_writer_handler.h" |
47 #endif | 48 #endif |
48 | 49 |
49 #if defined(ENABLE_PRINT_PREVIEW) || \ | 50 #if defined(ENABLE_PRINT_PREVIEW) || \ |
50 (defined(ENABLE_BASIC_PRINTING) && defined(OS_WIN)) | 51 (defined(ENABLE_BASIC_PRINTING) && defined(OS_WIN)) |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 | 119 |
119 #if defined(ENABLE_EXTENSIONS) | 120 #if defined(ENABLE_EXTENSIONS) |
120 handlers_.push_back(new extensions::ExtensionsHandler(this)); | 121 handlers_.push_back(new extensions::ExtensionsHandler(this)); |
121 handlers_.push_back(new image_writer::ImageWriterHandler()); | 122 handlers_.push_back(new image_writer::ImageWriterHandler()); |
122 #endif | 123 #endif |
123 | 124 |
124 #if defined(ENABLE_PRINT_PREVIEW) || \ | 125 #if defined(ENABLE_PRINT_PREVIEW) || \ |
125 (defined(ENABLE_BASIC_PRINTING) && defined(OS_WIN)) | 126 (defined(ENABLE_BASIC_PRINTING) && defined(OS_WIN)) |
126 handlers_.push_back(new printing::PrintingHandler()); | 127 handlers_.push_back(new printing::PrintingHandler()); |
127 #endif | 128 #endif |
| 129 |
| 130 #if defined(OS_WIN) |
| 131 handlers_.push_back(new IPCShellHandler()); |
| 132 #endif |
128 } | 133 } |
129 | 134 |
130 ChromeContentUtilityClient::~ChromeContentUtilityClient() { | 135 ChromeContentUtilityClient::~ChromeContentUtilityClient() { |
131 } | 136 } |
132 | 137 |
133 void ChromeContentUtilityClient::UtilityThreadStarted() { | 138 void ChromeContentUtilityClient::UtilityThreadStarted() { |
134 #if defined(ENABLE_EXTENSIONS) | 139 #if defined(ENABLE_EXTENSIONS) |
135 extensions::UtilityHandler::UtilityThreadStarted(); | 140 extensions::UtilityHandler::UtilityThreadStarted(); |
136 #endif | 141 #endif |
137 | 142 |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 safe_browsing::zip_analyzer::Results results; | 309 safe_browsing::zip_analyzer::Results results; |
305 safe_browsing::dmg::AnalyzeDMGFile( | 310 safe_browsing::dmg::AnalyzeDMGFile( |
306 IPC::PlatformFileForTransitToFile(dmg_file), &results); | 311 IPC::PlatformFileForTransitToFile(dmg_file), &results); |
307 Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished( | 312 Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished( |
308 results)); | 313 results)); |
309 ReleaseProcessIfNeeded(); | 314 ReleaseProcessIfNeeded(); |
310 } | 315 } |
311 #endif // defined(OS_MACOSX) | 316 #endif // defined(OS_MACOSX) |
312 | 317 |
313 #endif // defined(FULL_SAFE_BROWSING) | 318 #endif // defined(FULL_SAFE_BROWSING) |
OLD | NEW |