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

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

Issue 2122303002: Revive experiment to isolate shell operations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
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 20 matching lines...) Expand all
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"
42 #include "chrome/utility/shell_handler_impl_win.h" 41 #include "chrome/utility/shell_handler_impl_win.h"
43 #endif 42 #endif
44 43
45 #if defined(ENABLE_EXTENSIONS) 44 #if defined(ENABLE_EXTENSIONS)
46 #include "chrome/utility/extensions/extensions_handler.h" 45 #include "chrome/utility/extensions/extensions_handler.h"
47 #include "chrome/utility/image_writer/image_writer_handler.h" 46 #include "chrome/utility/image_writer/image_writer_handler.h"
48 #endif 47 #endif
49 48
50 #if defined(ENABLE_PRINT_PREVIEW) || \ 49 #if defined(ENABLE_PRINT_PREVIEW) || \
51 (defined(ENABLE_BASIC_PRINTING) && defined(OS_WIN)) 50 (defined(ENABLE_BASIC_PRINTING) && defined(OS_WIN))
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 118
120 #if defined(ENABLE_EXTENSIONS) 119 #if defined(ENABLE_EXTENSIONS)
121 handlers_.push_back(new extensions::ExtensionsHandler(this)); 120 handlers_.push_back(new extensions::ExtensionsHandler(this));
122 handlers_.push_back(new image_writer::ImageWriterHandler()); 121 handlers_.push_back(new image_writer::ImageWriterHandler());
123 #endif 122 #endif
124 123
125 #if defined(ENABLE_PRINT_PREVIEW) || \ 124 #if defined(ENABLE_PRINT_PREVIEW) || \
126 (defined(ENABLE_BASIC_PRINTING) && defined(OS_WIN)) 125 (defined(ENABLE_BASIC_PRINTING) && defined(OS_WIN))
127 handlers_.push_back(new printing::PrintingHandler()); 126 handlers_.push_back(new printing::PrintingHandler());
128 #endif 127 #endif
129
130 #if defined(OS_WIN)
131 handlers_.push_back(new IPCShellHandler());
132 #endif
133 } 128 }
134 129
135 ChromeContentUtilityClient::~ChromeContentUtilityClient() { 130 ChromeContentUtilityClient::~ChromeContentUtilityClient() {
136 } 131 }
137 132
138 void ChromeContentUtilityClient::UtilityThreadStarted() { 133 void ChromeContentUtilityClient::UtilityThreadStarted() {
139 #if defined(ENABLE_EXTENSIONS) 134 #if defined(ENABLE_EXTENSIONS)
140 extensions::UtilityHandler::UtilityThreadStarted(); 135 extensions::UtilityHandler::UtilityThreadStarted();
141 #endif 136 #endif
142 137
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 safe_browsing::zip_analyzer::Results results; 304 safe_browsing::zip_analyzer::Results results;
310 safe_browsing::dmg::AnalyzeDMGFile( 305 safe_browsing::dmg::AnalyzeDMGFile(
311 IPC::PlatformFileForTransitToFile(dmg_file), &results); 306 IPC::PlatformFileForTransitToFile(dmg_file), &results);
312 Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished( 307 Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished(
313 results)); 308 results));
314 ReleaseProcessIfNeeded(); 309 ReleaseProcessIfNeeded();
315 } 310 }
316 #endif // defined(OS_MACOSX) 311 #endif // defined(OS_MACOSX)
317 312
318 #endif // defined(FULL_SAFE_BROWSING) 313 #endif // defined(FULL_SAFE_BROWSING)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698