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

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

Issue 10871013: Add !defined(OS_IOS) to if defined(OS_MACOS) around functions GetSandboxProfileForSandboxType and G… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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/common/chrome_content_client.h ('k') | content/public/common/content_client.h » ('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/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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 DLOG(WARNING) << "Failed to start flash broker"; 515 DLOG(WARNING) << "Failed to start flash broker";
516 policy->SetJobLevel(sandbox::JOB_UNPROTECTED, 0); 516 policy->SetJobLevel(sandbox::JOB_UNPROTECTED, 0);
517 policy->SetTokenLevel( 517 policy->SetTokenLevel(
518 sandbox::USER_UNPROTECTED, sandbox::USER_UNPROTECTED); 518 sandbox::USER_UNPROTECTED, sandbox::USER_UNPROTECTED);
519 } 519 }
520 520
521 return true; 521 return true;
522 } 522 }
523 #endif 523 #endif
524 524
525 #if defined(OS_MACOSX) 525 #if defined(OS_MACOSX) && !defined(OS_IOS)
526 bool ChromeContentClient::GetSandboxProfileForSandboxType( 526 bool ChromeContentClient::GetSandboxProfileForSandboxType(
527 int sandbox_type, 527 int sandbox_type,
528 int* sandbox_profile_resource_id) const { 528 int* sandbox_profile_resource_id) const {
529 DCHECK(sandbox_profile_resource_id); 529 DCHECK(sandbox_profile_resource_id);
530 if (sandbox_type == CHROME_SANDBOX_TYPE_NACL_LOADER) { 530 if (sandbox_type == CHROME_SANDBOX_TYPE_NACL_LOADER) {
531 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; 531 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
532 return true; 532 return true;
533 } 533 }
534 return false; 534 return false;
535 } 535 }
536 536
537 std::string ChromeContentClient::GetCarbonInterposePath() const { 537 std::string ChromeContentClient::GetCarbonInterposePath() const {
538 return std::string(kInterposeLibraryPath); 538 return std::string(kInterposeLibraryPath);
539 } 539 }
540 #endif 540 #endif
541 541
542 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( 542 bool ChromeContentClient::GetBundledFieldTrialPepperFlash(
543 content::PepperPluginInfo* plugin, 543 content::PepperPluginInfo* plugin,
544 bool* override_npapi_flash) { 544 bool* override_npapi_flash) {
545 if (!ConductingPepperFlashFieldTrial()) 545 if (!ConductingPepperFlashFieldTrial())
546 return false; 546 return false;
547 return GetBundledPepperFlash(plugin, override_npapi_flash); 547 return GetBundledPepperFlash(plugin, override_npapi_flash);
548 } 548 }
549 549
550 } // namespace chrome 550 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | content/public/common/content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698