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

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

Issue 2784923002: [Media Router] Don't build dial_device_description_parser on Android. (Closed)
Patch Set: no ENABLE_MEDIA_ROUTER Created 3 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/utility/BUILD.gn ('k') | no next file » | 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 #include <vector> 9 #include <vector>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "chrome/common/file_patcher.mojom.h" 16 #include "chrome/common/file_patcher.mojom.h"
17 #include "chrome/utility/media_router/dial_device_description_parser_impl.h"
18 #include "chrome/utility/utility_message_handler.h" 17 #include "chrome/utility/utility_message_handler.h"
19 #include "components/payments/content/utility/payment_manifest_parser.h" 18 #include "components/payments/content/utility/payment_manifest_parser.h"
20 #include "components/safe_json/utility/safe_json_parser_mojo_impl.h" 19 #include "components/safe_json/utility/safe_json_parser_mojo_impl.h"
21 #include "content/public/common/content_switches.h" 20 #include "content/public/common/content_switches.h"
22 #include "content/public/common/service_info.h" 21 #include "content/public/common/service_info.h"
23 #include "content/public/utility/utility_thread.h" 22 #include "content/public/utility/utility_thread.h"
24 #include "courgette/courgette.h" 23 #include "courgette/courgette.h"
25 #include "courgette/third_party/bsdiff/bsdiff.h" 24 #include "courgette/third_party/bsdiff/bsdiff.h"
26 #include "extensions/features/features.h" 25 #include "extensions/features/features.h"
27 #include "mojo/public/cpp/bindings/strong_binding.h" 26 #include "mojo/public/cpp/bindings/strong_binding.h"
28 #include "printing/features/features.h" 27 #include "printing/features/features.h"
29 #include "services/service_manager/public/cpp/interface_registry.h" 28 #include "services/service_manager/public/cpp/interface_registry.h"
30 #include "third_party/zlib/google/zip.h" 29 #include "third_party/zlib/google/zip.h"
31 30
32 #if !defined(OS_ANDROID) 31 #if !defined(OS_ANDROID)
33 #include "chrome/common/resource_usage_reporter.mojom.h" 32 #include "chrome/common/resource_usage_reporter.mojom.h"
33 #include "chrome/utility/media_router/dial_device_description_parser_impl.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"
36 #include "net/proxy/mojo_proxy_resolver_factory_impl.h" 35 #include "net/proxy/mojo_proxy_resolver_factory_impl.h"
37 #include "net/proxy/proxy_resolver_v8.h" 36 #include "net/proxy/proxy_resolver_v8.h"
38 #endif 37 #endif // !defined(OS_ANDROID)
39 38
40 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
41 #include "chrome/common/zip_file_creator.mojom.h" 40 #include "chrome/common/zip_file_creator.mojom.h"
42 #endif 41 #endif
43 42
44 #if defined(OS_WIN) 43 #if defined(OS_WIN)
45 #include "chrome/utility/ipc_shell_handler_win.h" 44 #include "chrome/utility/ipc_shell_handler_win.h"
46 #include "chrome/utility/shell_handler_impl_win.h" 45 #include "chrome/utility/shell_handler_impl_win.h"
47 #endif 46 #endif
48 47
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 // interfaces to the interface registry. 271 // interfaces to the interface registry.
273 if (utility_process_running_elevated_) 272 if (utility_process_running_elevated_)
274 return; 273 return;
275 274
276 registry->AddInterface(base::Bind(&FilePatcherImpl::Create)); 275 registry->AddInterface(base::Bind(&FilePatcherImpl::Create));
277 #if !defined(OS_ANDROID) 276 #if !defined(OS_ANDROID)
278 registry->AddInterface<net::interfaces::ProxyResolverFactory>( 277 registry->AddInterface<net::interfaces::ProxyResolverFactory>(
279 base::Bind(CreateProxyResolverFactory)); 278 base::Bind(CreateProxyResolverFactory));
280 registry->AddInterface(base::Bind(CreateResourceUsageReporter)); 279 registry->AddInterface(base::Bind(CreateResourceUsageReporter));
281 registry->AddInterface(base::Bind(&ProfileImportHandler::Create)); 280 registry->AddInterface(base::Bind(&ProfileImportHandler::Create));
282 #endif 281 registry->AddInterface(
282 base::Bind(&media_router::DialDeviceDescriptionParserImpl::Create));
283 #endif // !defined(OS_ANDROID)
283 registry->AddInterface(base::Bind(&payments::PaymentManifestParser::Create)); 284 registry->AddInterface(base::Bind(&payments::PaymentManifestParser::Create));
284 registry->AddInterface( 285 registry->AddInterface(
285 base::Bind(&safe_json::SafeJsonParserMojoImpl::Create)); 286 base::Bind(&safe_json::SafeJsonParserMojoImpl::Create));
286 #if defined(OS_WIN) 287 #if defined(OS_WIN)
287 registry->AddInterface(base::Bind(&ShellHandlerImpl::Create)); 288 registry->AddInterface(base::Bind(&ShellHandlerImpl::Create));
288 #endif 289 #endif
289 #if defined(OS_CHROMEOS) 290 #if defined(OS_CHROMEOS)
290 registry->AddInterface(base::Bind(&ZipFileCreatorImpl::Create)); 291 registry->AddInterface(base::Bind(&ZipFileCreatorImpl::Create));
291 #endif 292 #endif
292 #if defined(FULL_SAFE_BROWSING) 293 #if defined(FULL_SAFE_BROWSING)
293 registry->AddInterface(base::Bind(&SafeArchiveAnalyzerImpl::Create)); 294 registry->AddInterface(base::Bind(&SafeArchiveAnalyzerImpl::Create));
294 #endif 295 #endif
295 #if defined(ENABLE_MEDIA_ROUTER)
296 registry->AddInterface(
297 base::Bind(&media_router::DialDeviceDescriptionParserImpl::Create));
298 #endif // defined(ENABLE_MEDIA_ROUTER)
299 } 296 }
300 297
301 // static 298 // static
302 void ChromeContentUtilityClient::PreSandboxStartup() { 299 void ChromeContentUtilityClient::PreSandboxStartup() {
303 #if BUILDFLAG(ENABLE_EXTENSIONS) 300 #if BUILDFLAG(ENABLE_EXTENSIONS)
304 extensions::ExtensionsHandler::PreSandboxStartup(); 301 extensions::ExtensionsHandler::PreSandboxStartup();
305 #endif 302 #endif
306 } 303 }
OLDNEW
« no previous file with comments | « chrome/utility/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698