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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 16881004: Move chrome/nacl to components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Windows build fix Created 7 years, 6 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/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/cpu.h" 8 #include "base/cpu.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 28 matching lines...) Expand all
39 #include "webkit/plugins/plugin_switches.h" 39 #include "webkit/plugins/plugin_switches.h"
40 40
41 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. 41 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR.
42 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 42 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
43 43
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 #include "base/win/registry.h" 45 #include "base/win/registry.h"
46 #include "base/win/windows_version.h" 46 #include "base/win/windows_version.h"
47 #include "sandbox/win/src/sandbox.h" 47 #include "sandbox/win/src/sandbox.h"
48 #elif defined(OS_MACOSX) 48 #elif defined(OS_MACOSX)
49 #include "chrome/common/chrome_sandbox_type_mac.h" 49 #include "components/nacl/common/nacl_sandbox_type_mac.h"
50 #endif 50 #endif
51 51
52 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ 52 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
53 !defined(WIDEVINE_CDM_IS_COMPONENT) 53 !defined(WIDEVINE_CDM_IS_COMPONENT)
54 #include "chrome/common/widevine_cdm_constants.h" 54 #include "chrome/common/widevine_cdm_constants.h"
55 #endif 55 #endif
56 56
57 namespace { 57 namespace {
58 58
59 const char kPDFPluginMimeType[] = "application/pdf"; 59 const char kPDFPluginMimeType[] = "application/pdf";
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 484
485 DCHECK(false) << "Unknown child process type!"; 485 DCHECK(false) << "Unknown child process type!";
486 return "Unknown"; 486 return "Unknown";
487 } 487 }
488 488
489 #if defined(OS_MACOSX) && !defined(OS_IOS) 489 #if defined(OS_MACOSX) && !defined(OS_IOS)
490 bool ChromeContentClient::GetSandboxProfileForSandboxType( 490 bool ChromeContentClient::GetSandboxProfileForSandboxType(
491 int sandbox_type, 491 int sandbox_type,
492 int* sandbox_profile_resource_id) const { 492 int* sandbox_profile_resource_id) const {
493 DCHECK(sandbox_profile_resource_id); 493 DCHECK(sandbox_profile_resource_id);
494 if (sandbox_type == CHROME_SANDBOX_TYPE_NACL_LOADER) { 494 if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) {
495 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; 495 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
496 return true; 496 return true;
497 } 497 }
498 return false; 498 return false;
499 } 499 }
500 500
501 std::string ChromeContentClient::GetCarbonInterposePath() const { 501 std::string ChromeContentClient::GetCarbonInterposePath() const {
502 return std::string(kInterposeLibraryPath); 502 return std::string(kInterposeLibraryPath);
503 } 503 }
504 #endif 504 #endif
505 505
506 } // namespace chrome 506 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698