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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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/DEPS ('k') | chromecast/browser/DEPS » ('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"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "chrome/common/chrome_utility_messages.h" 15 #include "chrome/common/chrome_utility_messages.h"
16 #include "chrome/common/safe_browsing/zip_analyzer.h" 16 #include "chrome/common/safe_browsing/zip_analyzer.h"
17 #include "chrome/common/safe_browsing/zip_analyzer_results.h" 17 #include "chrome/common/safe_browsing/zip_analyzer_results.h"
18 #include "chrome/utility/chrome_content_utility_ipc_whitelist.h" 18 #include "chrome/utility/chrome_content_utility_ipc_whitelist.h"
19 #include "chrome/utility/image_decoder_impl.h" 19 #include "chrome/utility/image_decoder_impl.h"
20 #include "chrome/utility/utility_message_handler.h" 20 #include "chrome/utility/utility_message_handler.h"
21 #include "components/safe_json/utility/safe_json_parser_mojo_impl.h" 21 #include "components/safe_json/utility/safe_json_parser_mojo_impl.h"
22 #include "content/public/child/image_decoder_utils.h" 22 #include "content/public/child/image_decoder_utils.h"
23 #include "content/public/common/content_switches.h" 23 #include "content/public/common/content_switches.h"
24 #include "content/public/utility/utility_thread.h" 24 #include "content/public/utility/utility_thread.h"
25 #include "courgette/courgette.h" 25 #include "courgette/courgette.h"
26 #include "courgette/third_party/bsdiff/bsdiff.h" 26 #include "courgette/third_party/bsdiff/bsdiff.h"
27 #include "ipc/ipc_channel.h" 27 #include "ipc/ipc_channel.h"
28 #include "mojo/public/cpp/bindings/strong_binding.h" 28 #include "mojo/public/cpp/bindings/strong_binding.h"
29 #include "services/shell/public/cpp/interface_registry.h" 29 #include "services/service_manager/public/cpp/interface_registry.h"
30 #include "third_party/zlib/google/zip.h" 30 #include "third_party/zlib/google/zip.h"
31 #include "ui/gfx/geometry/size.h" 31 #include "ui/gfx/geometry/size.h"
32 32
33 #if !defined(OS_ANDROID) 33 #if !defined(OS_ANDROID)
34 #include "chrome/common/resource_usage_reporter.mojom.h" 34 #include "chrome/common/resource_usage_reporter.mojom.h"
35 #include "chrome/utility/profile_import_handler.h" 35 #include "chrome/utility/profile_import_handler.h"
36 #include "mojo/public/cpp/bindings/strong_binding.h" 36 #include "mojo/public/cpp/bindings/strong_binding.h"
37 #include "net/proxy/mojo_proxy_resolver_factory_impl.h" 37 #include "net/proxy/mojo_proxy_resolver_factory_impl.h"
38 #include "net/proxy/proxy_resolver_v8.h" 38 #include "net/proxy/proxy_resolver_v8.h"
39 #endif 39 #endif
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 safe_browsing::zip_analyzer::Results results; 307 safe_browsing::zip_analyzer::Results results;
308 safe_browsing::dmg::AnalyzeDMGFile( 308 safe_browsing::dmg::AnalyzeDMGFile(
309 IPC::PlatformFileForTransitToFile(dmg_file), &results); 309 IPC::PlatformFileForTransitToFile(dmg_file), &results);
310 Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished( 310 Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished(
311 results)); 311 results));
312 ReleaseProcessIfNeeded(); 312 ReleaseProcessIfNeeded();
313 } 313 }
314 #endif // defined(OS_MACOSX) 314 #endif // defined(OS_MACOSX)
315 315
316 #endif // defined(FULL_SAFE_BROWSING) 316 #endif // defined(FULL_SAFE_BROWSING)
OLDNEW
« no previous file with comments | « chrome/utility/DEPS ('k') | chromecast/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698