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

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

Issue 11035070: <browser> Disable browser plugin in content_shell by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync @tott + fix one include order. Created 8 years, 2 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 | « no previous file | chrome/common/chrome_switches.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/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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 switches::kAppsCheckoutURL, 901 switches::kAppsCheckoutURL,
902 switches::kAppsGalleryURL, 902 switches::kAppsGalleryURL,
903 switches::kCloudPrintServiceURL, 903 switches::kCloudPrintServiceURL,
904 switches::kDebugPrint, 904 switches::kDebugPrint,
905 switches::kDisableAsynchronousSpellChecking, 905 switches::kDisableAsynchronousSpellChecking,
906 switches::kDisableBundledPpapiFlash, 906 switches::kDisableBundledPpapiFlash,
907 switches::kDisableExtensionsResourceWhitelist, 907 switches::kDisableExtensionsResourceWhitelist,
908 switches::kDisableScriptedPrintThrottling, 908 switches::kDisableScriptedPrintThrottling,
909 switches::kDumpHistogramsOnExit, 909 switches::kDumpHistogramsOnExit,
910 switches::kEnableBenchmarking, 910 switches::kEnableBenchmarking,
911 switches::kEnableBrowserPluginForAllViewTypes,
912 switches::kEnableBundledPpapiFlash, 911 switches::kEnableBundledPpapiFlash,
913 switches::kEnableCrxlessWebApps, 912 switches::kEnableCrxlessWebApps,
914 switches::kEnableExperimentalExtensionApis, 913 switches::kEnableExperimentalExtensionApis,
915 switches::kEnableFramelessConstrainedDialogs, 914 switches::kEnableFramelessConstrainedDialogs,
916 switches::kEnableIPCFuzzing, 915 switches::kEnableIPCFuzzing,
917 switches::kEnableNaCl, 916 switches::kEnableNaCl,
918 switches::kEnableNaClIPCProxy, 917 switches::kEnableNaClIPCProxy,
919 switches::kEnablePasswordGeneration, 918 switches::kEnablePasswordGeneration,
920 switches::kEnablePnacl, 919 switches::kEnablePnacl,
921 switches::kEnableWatchdog, 920 switches::kEnableWatchdog,
(...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after
1840 partition_id = extension->id(); 1839 partition_id = extension->id();
1841 } 1840 }
1842 1841
1843 // Enforce that IsValidStoragePartitionId() implementation stays in sync. 1842 // Enforce that IsValidStoragePartitionId() implementation stays in sync.
1844 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); 1843 DCHECK(IsValidStoragePartitionId(browser_context, partition_id));
1845 return partition_id; 1844 return partition_id;
1846 } 1845 }
1847 1846
1848 1847
1849 } // namespace chrome 1848 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698