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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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/renderer/chrome_render_process_observer.cc ('k') | components/bitmap_uploader/BUILD.gn » ('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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 15 matching lines...) Expand all
26 #include "third_party/zlib/google/zip.h" 26 #include "third_party/zlib/google/zip.h"
27 #include "ui/gfx/geometry/size.h" 27 #include "ui/gfx/geometry/size.h"
28 28
29 #if defined(OS_CHROMEOS) 29 #if defined(OS_CHROMEOS)
30 #include "ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h" 30 #include "ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h"
31 #endif 31 #endif
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 "net/proxy/mojo_proxy_resolver_factory_impl.h" 37 #include "net/proxy/mojo_proxy_resolver_factory_impl.h"
37 #include "net/proxy/proxy_resolver_v8.h" 38 #include "net/proxy/proxy_resolver_v8.h"
38 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
39 #endif 39 #endif
40 40
41 #if defined(OS_WIN) 41 #if defined(OS_WIN)
42 #include "chrome/utility/font_cache_handler_win.h" 42 #include "chrome/utility/font_cache_handler_win.h"
43 #include "chrome/utility/shell_handler_win.h" 43 #include "chrome/utility/shell_handler_win.h"
44 #endif 44 #endif
45 45
46 #if defined(ENABLE_EXTENSIONS) 46 #if defined(ENABLE_EXTENSIONS)
47 #include "chrome/utility/extensions/extensions_handler.h" 47 #include "chrome/utility/extensions/extensions_handler.h"
48 #include "chrome/utility/image_writer/image_writer_handler.h" 48 #include "chrome/utility/image_writer/image_writer_handler.h"
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 safe_browsing::zip_analyzer::Results results; 398 safe_browsing::zip_analyzer::Results results;
399 safe_browsing::dmg::AnalyzeDMGFile( 399 safe_browsing::dmg::AnalyzeDMGFile(
400 IPC::PlatformFileForTransitToFile(dmg_file), &results); 400 IPC::PlatformFileForTransitToFile(dmg_file), &results);
401 Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished( 401 Send(new ChromeUtilityHostMsg_AnalyzeDmgFileForDownloadProtection_Finished(
402 results)); 402 results));
403 ReleaseProcessIfNeeded(); 403 ReleaseProcessIfNeeded();
404 } 404 }
405 #endif // defined(OS_MACOSX) 405 #endif // defined(OS_MACOSX)
406 406
407 #endif // defined(FULL_SAFE_BROWSING) 407 #endif // defined(FULL_SAFE_BROWSING)
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_render_process_observer.cc ('k') | components/bitmap_uploader/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698