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

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: merge TerminalPrivate api changes 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 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 switches::kMessageLoopHistogrammer, 653 switches::kMessageLoopHistogrammer,
654 switches::kNoRunningInsecureContent, 654 switches::kNoRunningInsecureContent,
655 switches::kPpapiFlashArgs, 655 switches::kPpapiFlashArgs,
656 switches::kPpapiFlashInProcess, 656 switches::kPpapiFlashInProcess,
657 switches::kPpapiFlashPath, 657 switches::kPpapiFlashPath,
658 switches::kPpapiFlashVersion, 658 switches::kPpapiFlashVersion,
659 switches::kProfilingAtStart, 659 switches::kProfilingAtStart,
660 switches::kProfilingFile, 660 switches::kProfilingFile,
661 switches::kProfilingFlush, 661 switches::kProfilingFlush,
662 switches::kSilentDumpOnDCHECK, 662 switches::kSilentDumpOnDCHECK,
663 switches::kWhitelistedExtensionID,
663 }; 664 };
664 665
665 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 666 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
666 arraysize(kSwitchNames)); 667 arraysize(kSwitchNames));
667 } else if (process_type == switches::kUtilityProcess) { 668 } else if (process_type == switches::kUtilityProcess) {
668 if (browser_command_line.HasSwitch( 669 static const char* const kSwitchNames[] = {
669 switches::kEnableExperimentalExtensionApis)) { 670 switches::kEnableExperimentalExtensionApis,
670 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); 671 switches::kWhitelistedExtensionID,
671 } 672 };
673
674 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
675 arraysize(kSwitchNames));
672 } else if (process_type == switches::kPluginProcess) { 676 } else if (process_type == switches::kPluginProcess) {
673 static const char* const kSwitchNames[] = { 677 static const char* const kSwitchNames[] = {
674 #if defined(OS_CHROMEOS) 678 #if defined(OS_CHROMEOS)
675 switches::kLoginProfile, 679 switches::kLoginProfile,
676 #endif 680 #endif
677 switches::kMemoryProfiling, 681 switches::kMemoryProfiling,
678 switches::kSilentDumpOnDCHECK, 682 switches::kSilentDumpOnDCHECK,
679 switches::kUserDataDir, 683 switches::kUserDataDir,
680 }; 684 };
681 685
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after
1475 #if defined(USE_NSS) 1479 #if defined(USE_NSS)
1476 crypto::CryptoModuleBlockingPasswordDelegate* 1480 crypto::CryptoModuleBlockingPasswordDelegate*
1477 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1481 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1478 const GURL& url) { 1482 const GURL& url) {
1479 return browser::NewCryptoModuleBlockingDialogDelegate( 1483 return browser::NewCryptoModuleBlockingDialogDelegate(
1480 browser::kCryptoModulePasswordKeygen, url.host()); 1484 browser::kCryptoModulePasswordKeygen, url.host());
1481 } 1485 }
1482 #endif 1486 #endif
1483 1487
1484 } // namespace chrome 1488 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698