Added enhanced bookmarks extension as an external component extension

chrome/common/chrome_switches.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 310 matching lines @@
 // Disables device discovery.
 const char kDisableDeviceDiscovery[]        = "disable-device-discovery";
 
 // Disables device discovery notifications.
 const char kDisableDeviceDiscoveryNotifications[] =
     "disable-device-discovery-notifications";
 
 // Disables retrieval of PAC URLs from DHCP as per the WPAD standard.
 const char kDisableDhcpWpad[]               = "disable-dhcp-wpad";
 
+// Force-disables DNS probes on main frame DNS errors.
+const char kDisableDnsProbes[]              = "disable-dns-probes";

[Yaron, 2013/11/25 23:49:33]

Merge error?

[yefimt, 2013/11/26 00:14:48]

Yes, thank you
On 2013/11/25 23:49:33, Yaron wrote:

+
 // Disable extensions.
 const char kDisableExtensions[]             = "disable-extensions";
 
 // Disable checking for user opt-in for extensions that want to inject script
 // into file URLs (ie, always allow it). This is used during automated testing.
 const char kDisableExtensionsFileAccessCheck[] =
     "disable-extensions-file-access-check";
 
 // Disable the net::URLRequestThrottlerManager functionality for
 // requests originating from extensions.
@@ skipping 239 matching lines @@
 // If true devtools experimental settings are enabled.
 const char kEnableDevToolsExperiments[]     = "enable-devtools-experiments";
 
 // Enable device discovery notifications.
 const char kEnableDeviceDiscoveryNotifications[] =
     "enable-device-discovery-notifications";
 
 // Enables the DOM distiller.
 const char kEnableDomDistiller[]               = "enable-dom-distiller";
 
+// Enable Enhanced Bookmarks.
+const char kEnableEnhancedBookmarks[] = "enable-enhanced-bookmarks";
+
 // Enables experimentation with ephemeral apps, which are launched without
 // installing in Chrome.
 const char kEnableEphemeralApps[]           = "enable-ephemeral-apps";
 
 // Enables logging for extension activity.
 const char kEnableExtensionActivityLogging[] =
     "enable-extension-activity-logging";
 
 const char kEnableExtensionActivityLogTesting[] =
     "enable-extension-activity-log-testing";
@@ skipping 1030 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead, please
 // put them in alphabetical order above, or in order inside the appropriate
 // ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches