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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 9317013: Add a centralized mechanism for whitelisting access to extension permissions. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: comments Created 8 years, 10 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/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 switches::kMessageLoopHistogrammer, 652 switches::kMessageLoopHistogrammer,
653 switches::kNoRunningInsecureContent, 653 switches::kNoRunningInsecureContent,
654 switches::kPpapiFlashArgs, 654 switches::kPpapiFlashArgs,
655 switches::kPpapiFlashInProcess, 655 switches::kPpapiFlashInProcess,
656 switches::kPpapiFlashPath, 656 switches::kPpapiFlashPath,
657 switches::kPpapiFlashVersion, 657 switches::kPpapiFlashVersion,
658 switches::kProfilingAtStart, 658 switches::kProfilingAtStart,
659 switches::kProfilingFile, 659 switches::kProfilingFile,
660 switches::kProfilingFlush, 660 switches::kProfilingFlush,
661 switches::kSilentDumpOnDCHECK, 661 switches::kSilentDumpOnDCHECK,
662 switches::kWhitelistedExtensionID,
662 }; 663 };
663 664
664 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 665 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
665 arraysize(kSwitchNames)); 666 arraysize(kSwitchNames));
666 } else if (process_type == switches::kUtilityProcess) { 667 } else if (process_type == switches::kUtilityProcess) {
667 if (browser_command_line.HasSwitch( 668 static const char* const kSwitchNames[] = {
668 switches::kEnableExperimentalExtensionApis)) { 669 switches::kEnableExperimentalExtensionApis,
669 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); 670 switches::kWhitelistedExtensionID,
670 } 671 };
672
673 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
674 arraysize(kSwitchNames));
671 } else if (process_type == switches::kPluginProcess) { 675 } else if (process_type == switches::kPluginProcess) {
672 static const char* const kSwitchNames[] = { 676 static const char* const kSwitchNames[] = {
673 #if defined(OS_CHROMEOS) 677 #if defined(OS_CHROMEOS)
674 switches::kLoginProfile, 678 switches::kLoginProfile,
675 #endif 679 #endif
676 switches::kMemoryProfiling, 680 switches::kMemoryProfiling,
677 switches::kSilentDumpOnDCHECK, 681 switches::kSilentDumpOnDCHECK,
678 switches::kUserDataDir, 682 switches::kUserDataDir,
679 }; 683 };
680 684
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after
1451 #if defined(USE_NSS) 1455 #if defined(USE_NSS)
1452 crypto::CryptoModuleBlockingPasswordDelegate* 1456 crypto::CryptoModuleBlockingPasswordDelegate*
1453 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1457 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1454 const GURL& url) { 1458 const GURL& url) {
1455 return browser::NewCryptoModuleBlockingDialogDelegate( 1459 return browser::NewCryptoModuleBlockingDialogDelegate(
1456 browser::kCryptoModulePasswordKeygen, url.host()); 1460 browser::kCryptoModulePasswordKeygen, url.host());
1457 } 1461 }
1458 #endif 1462 #endif
1459 1463
1460 } // namespace chrome 1464 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/input_method_event_router.h » ('j') | chrome/common/extensions/extension.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698