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 14021015: Move components/zip to third_party/zip (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update unit_tests.isolate for new test data location Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/unit_tests.isolate ('k') | components/components.gyp » ('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/base64.h" 7 #include "base/base64.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/common/extensions/incognito_handler.h" 27 #include "chrome/common/extensions/incognito_handler.h"
28 #include "chrome/common/extensions/manifest.h" 28 #include "chrome/common/extensions/manifest.h"
29 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" 29 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
30 #include "chrome/common/extensions/manifest_handlers/theme_handler.h" 30 #include "chrome/common/extensions/manifest_handlers/theme_handler.h"
31 #include "chrome/common/extensions/permissions/chrome_api_permissions.h" 31 #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
32 #include "chrome/common/extensions/unpacker.h" 32 #include "chrome/common/extensions/unpacker.h"
33 #include "chrome/common/extensions/update_manifest.h" 33 #include "chrome/common/extensions/update_manifest.h"
34 #include "chrome/common/safe_browsing/zip_analyzer.h" 34 #include "chrome/common/safe_browsing/zip_analyzer.h"
35 #include "chrome/common/web_resource/web_resource_unpacker.h" 35 #include "chrome/common/web_resource/web_resource_unpacker.h"
36 #include "chrome/utility/profile_import_handler.h" 36 #include "chrome/utility/profile_import_handler.h"
37 #include "components/zip/zip.h"
38 #include "content/public/utility/utility_thread.h" 37 #include "content/public/utility/utility_thread.h"
39 #include "printing/backend/print_backend.h" 38 #include "printing/backend/print_backend.h"
40 #include "printing/page_range.h" 39 #include "printing/page_range.h"
41 #include "third_party/skia/include/core/SkBitmap.h" 40 #include "third_party/skia/include/core/SkBitmap.h"
41 #include "third_party/zlib/google/zip.h"
42 #include "ui/base/ui_base_switches.h" 42 #include "ui/base/ui_base_switches.h"
43 #include "ui/gfx/codec/jpeg_codec.h" 43 #include "ui/gfx/codec/jpeg_codec.h"
44 #include "ui/gfx/rect.h" 44 #include "ui/gfx/rect.h"
45 #include "webkit/glue/image_decoder.h" 45 #include "webkit/glue/image_decoder.h"
46 46
47 #if defined(OS_WIN) 47 #if defined(OS_WIN)
48 #include "base/path_service.h" 48 #include "base/path_service.h"
49 #include "base/win/iat_patch_function.h" 49 #include "base/win/iat_patch_function.h"
50 #include "base/win/scoped_handle.h" 50 #include "base/win/scoped_handle.h"
51 #include "content/public/common/content_switches.h" 51 #include "content/public/common/content_switches.h"
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 IPC::PlatformFileForTransit zip_file) { 491 IPC::PlatformFileForTransit zip_file) {
492 safe_browsing::zip_analyzer::Results results; 492 safe_browsing::zip_analyzer::Results results;
493 safe_browsing::zip_analyzer::AnalyzeZipFile( 493 safe_browsing::zip_analyzer::AnalyzeZipFile(
494 IPC::PlatformFileForTransitToPlatformFile(zip_file), &results); 494 IPC::PlatformFileForTransitToPlatformFile(zip_file), &results);
495 Send(new ChromeUtilityHostMsg_AnalyzeZipFileForDownloadProtection_Finished( 495 Send(new ChromeUtilityHostMsg_AnalyzeZipFileForDownloadProtection_Finished(
496 results)); 496 results));
497 content::UtilityThread::Get()->ReleaseProcessIfNeeded(); 497 content::UtilityThread::Get()->ReleaseProcessIfNeeded();
498 } 498 }
499 499
500 } // namespace chrome 500 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/unit_tests.isolate ('k') | components/components.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698