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

Side by Side Diff: chrome/common/chrome_switches.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
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_switches.h" 5 #include "chrome/common/chrome_switches.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 9
10 namespace switches { 10 namespace switches {
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 const char kEnableAutofillFeedback[] = "enable-autofill-feedback"; 466 const char kEnableAutofillFeedback[] = "enable-autofill-feedback";
467 467
468 // Enables the pre- and auto-login features. When a user signs in to sync, the 468 // Enables the pre- and auto-login features. When a user signs in to sync, the
469 // browser's cookie jar is pre-filled with GAIA cookies. When the user visits a 469 // browser's cookie jar is pre-filled with GAIA cookies. When the user visits a
470 // GAIA login page, an info bar can help the user login. 470 // GAIA login page, an info bar can help the user login.
471 const char kEnableAutologin[] = "enable-autologin"; 471 const char kEnableAutologin[] = "enable-autologin";
472 472
473 // Enables the benchmarking extensions. 473 // Enables the benchmarking extensions.
474 const char kEnableBenchmarking[] = "enable-benchmarking"; 474 const char kEnableBenchmarking[] = "enable-benchmarking";
475 475
476 // Enables browser plugin for regular pages as well (not just apps).
477 const char kEnableBrowserPluginForAllViewTypes[] =
478 "enable-browser-plugin-for-all-view-types";
479
480 // Enables the bundled PPAPI version of Flash. 476 // Enables the bundled PPAPI version of Flash.
481 const char kEnableBundledPpapiFlash[] = "enable-bundled-ppapi-flash"; 477 const char kEnableBundledPpapiFlash[] = "enable-bundled-ppapi-flash";
482 478
483 // Enables the new cloud policy stack. 479 // Enables the new cloud policy stack.
484 const char kEnableCloudPolicyService[] = "enable-cloud-policy-service"; 480 const char kEnableCloudPolicyService[] = "enable-cloud-policy-service";
485 481
486 // This applies only when the process type is "service". Enables the Cloud 482 // This applies only when the process type is "service". Enables the Cloud
487 // Print Proxy component within the service process. 483 // Print Proxy component within the service process.
488 const char kEnableCloudPrintProxy[] = "enable-cloud-print-proxy"; 484 const char kEnableCloudPrintProxy[] = "enable-cloud-print-proxy";
489 485
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1590 1586
1591 // ----------------------------------------------------------------------------- 1587 // -----------------------------------------------------------------------------
1592 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1588 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1593 // 1589 //
1594 // You were going to just dump your switches here, weren't you? Instead, please 1590 // You were going to just dump your switches here, weren't you? Instead, please
1595 // put them in alphabetical order above, or in order inside the appropriate 1591 // put them in alphabetical order above, or in order inside the appropriate
1596 // ifdef at the bottom. The order should match the header. 1592 // ifdef at the bottom. The order should match the header.
1597 // ----------------------------------------------------------------------------- 1593 // -----------------------------------------------------------------------------
1598 1594
1599 } // namespace switches 1595 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | content/browser/browser_plugin/browser_plugin_host_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698