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

Side by Side Diff: chrome/common/chrome_switches.cc

Issue 32473009: Enable Google Now By Default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « chrome/common/chrome_switches.h ('k') | no next file » | 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/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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 352
353 // Disable the net::URLRequestThrottlerManager functionality for 353 // Disable the net::URLRequestThrottlerManager functionality for
354 // requests originating from extensions. 354 // requests originating from extensions.
355 const char kDisableExtensionsHttpThrottling[] = 355 const char kDisableExtensionsHttpThrottling[] =
356 "disable-extensions-http-throttling"; 356 "disable-extensions-http-throttling";
357 357
358 // Disable mandatory enforcement of web_accessible_resources in extensions. 358 // Disable mandatory enforcement of web_accessible_resources in extensions.
359 const char kDisableExtensionsResourceWhitelist[] = 359 const char kDisableExtensionsResourceWhitelist[] =
360 "disable-extensions-resource-whitelist"; 360 "disable-extensions-resource-whitelist";
361 361
362 // Disables Google Now integration.
363 const char kDisableGoogleNowIntegration[] = "disable-google-now-integration";
364
362 // Disable Instant extended API. 365 // Disable Instant extended API.
363 const char kDisableInstantExtendedAPI[] = "disable-instant-extended-api"; 366 const char kDisableInstantExtendedAPI[] = "disable-instant-extended-api";
364 367
365 // Disables improved SafeBrowsing download protection. 368 // Disables improved SafeBrowsing download protection.
366 const char kDisableImprovedDownloadProtection[] = 369 const char kDisableImprovedDownloadProtection[] =
367 "disable-improved-download-protection"; 370 "disable-improved-download-protection";
368 371
369 // Don't resolve hostnames to IPv6 addresses. This can be used when debugging 372 // Don't resolve hostnames to IPv6 addresses. This can be used when debugging
370 // issues relating to IPv6, but shouldn't otherwise be needed. Be sure to file 373 // issues relating to IPv6, but shouldn't otherwise be needed. Be sure to file
371 // bugs if something isn't working properly in the presence of IPv6. This flag 374 // bugs if something isn't working properly in the presence of IPv6. This flag
(...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after
1665 1668
1666 // ----------------------------------------------------------------------------- 1669 // -----------------------------------------------------------------------------
1667 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1670 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1668 // 1671 //
1669 // You were going to just dump your switches here, weren't you? Instead, please 1672 // You were going to just dump your switches here, weren't you? Instead, please
1670 // put them in alphabetical order above, or in order inside the appropriate 1673 // put them in alphabetical order above, or in order inside the appropriate
1671 // ifdef at the bottom. The order should match the header. 1674 // ifdef at the bottom. The order should match the header.
1672 // ----------------------------------------------------------------------------- 1675 // -----------------------------------------------------------------------------
1673 1676
1674 } // namespace switches 1677 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698