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

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

Issue 8429023: Add platform_app flag to manifest. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge conflict resolution. Created 9 years, 1 month 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') | chrome/common/extensions/extension.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 // issues relating to IPv6, but shouldn't otherwise be needed. Be sure to file 273 // issues relating to IPv6, but shouldn't otherwise be needed. Be sure to file
274 // bugs if something isn't working properly in the presence of IPv6. This flag 274 // bugs if something isn't working properly in the presence of IPv6. This flag
275 // can be overidden by the "enable-ipv6" flag. 275 // can be overidden by the "enable-ipv6" flag.
276 const char kDisableIPv6[] = "disable-ipv6"; 276 const char kDisableIPv6[] = "disable-ipv6";
277 277
278 // Disables IP Pooling within the networks stack (SPDY only). When a connection 278 // Disables IP Pooling within the networks stack (SPDY only). When a connection
279 // is needed for a domain which shares an IP with an existing connection, 279 // is needed for a domain which shares an IP with an existing connection,
280 // attempt to use the existing connection. 280 // attempt to use the existing connection.
281 const char kDisableIPPooling[] = "disable-ip-pooling"; 281 const char kDisableIPPooling[] = "disable-ip-pooling";
282 282
283 // Disables panels (always on-top docked pop-up windows).
284 const char kDisablePanels[] = "disable-panels";
285
283 // Disable speculative TCP/IP preconnection. 286 // Disable speculative TCP/IP preconnection.
284 const char kDisablePreconnect[] = "disable-preconnect"; 287 const char kDisablePreconnect[] = "disable-preconnect";
285 288
286 // Normally when the user attempts to navigate to a page that was the result of 289 // Normally when the user attempts to navigate to a page that was the result of
287 // a post we prompt to make sure they want to. This switch may be used to 290 // a post we prompt to make sure they want to. This switch may be used to
288 // disable that check. This switch is used during automated testing. 291 // disable that check. This switch is used during automated testing.
289 const char kDisablePromptOnRepost[] = "disable-prompt-on-repost"; 292 const char kDisablePromptOnRepost[] = "disable-prompt-on-repost";
290 293
291 // Disables remote web font support. SVG font should always work whether this 294 // Disables remote web font support. SVG font should always work whether this
292 // option is specified or not. 295 // option is specified or not.
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 // Runs the Native Client inside the renderer process and enables GPU plugin 502 // Runs the Native Client inside the renderer process and enables GPU plugin
500 // (internally adds lEnableGpuPlugin to the command line). 503 // (internally adds lEnableGpuPlugin to the command line).
501 const char kEnableNaCl[] = "enable-nacl"; 504 const char kEnableNaCl[] = "enable-nacl";
502 505
503 // Enables debugging via RSP over a socket. 506 // Enables debugging via RSP over a socket.
504 const char kEnableNaClDebug[] = "enable-nacl-debug"; 507 const char kEnableNaClDebug[] = "enable-nacl-debug";
505 508
506 // Enabled integrated bookmark features in the New Tab pane. 509 // Enabled integrated bookmark features in the New Tab pane.
507 const char kEnableNTPBookmarkFeatures[] = "enable-ntp-bookmark-features"; 510 const char kEnableNTPBookmarkFeatures[] = "enable-ntp-bookmark-features";
508 511
512 // Enables advanced app capabilities.
513 const char kEnablePlatformApps[] = "enable-platform-apps";
514
509 // Enables content settings based on host *and* plug-in in the user 515 // Enables content settings based on host *and* plug-in in the user
510 // preferences. 516 // preferences.
511 const char kEnableResourceContentSettings[] = 517 const char kEnableResourceContentSettings[] =
512 "enable-resource-content-settings"; 518 "enable-resource-content-settings";
513 519
514 // Disables panels (always on-top docked pop-up windows).
515 const char kDisablePanels[] = "disable-panels";
516
517 // Enables speculative TCP/IP preconnection. 520 // Enables speculative TCP/IP preconnection.
518 const char kEnablePreconnect[] = "enable-preconnect"; 521 const char kEnablePreconnect[] = "enable-preconnect";
519 522
520 // Controls the support for SDCH filtering (dictionary based expansion of 523 // Controls the support for SDCH filtering (dictionary based expansion of
521 // content). By default SDCH filtering is enabled. To disable SDCH filtering, 524 // content). By default SDCH filtering is enabled. To disable SDCH filtering,
522 // use "--enable-sdch=0" as command line argument. SDCH is currently only 525 // use "--enable-sdch=0" as command line argument. SDCH is currently only
523 // supported server-side for searches on google.com. 526 // supported server-side for searches on google.com.
524 const char kEnableSdch[] = "enable-sdch"; 527 const char kEnableSdch[] = "enable-sdch";
525 528
526 // Enables the IsSearchProviderInstalled and InstallSearchProvider with an 529 // Enables the IsSearchProviderInstalled and InstallSearchProvider with an
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 1297
1295 // ----------------------------------------------------------------------------- 1298 // -----------------------------------------------------------------------------
1296 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1299 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1297 // 1300 //
1298 // You were going to just dump your switches here, weren't you? Instead, please 1301 // You were going to just dump your switches here, weren't you? Instead, please
1299 // put them in alphabetical order above, or in order inside the appropriate 1302 // put them in alphabetical order above, or in order inside the appropriate
1300 // ifdef at the bottom. The order should match the header. 1303 // ifdef at the bottom. The order should match the header.
1301 // ----------------------------------------------------------------------------- 1304 // -----------------------------------------------------------------------------
1302 1305
1303 } // namespace switches 1306 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/common/extensions/extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698