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

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

Issue 2668553003: Instant Apps: Remove experiment. (Closed)
Patch Set: Rebase Created 3 years, 10 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
« 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 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "ppapi/features/features.h" 10 #include "ppapi/features/features.h"
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
866 #if !defined(GOOGLE_CHROME_BUILD) 866 #if !defined(GOOGLE_CHROME_BUILD)
867 // Enables a live-reload for local NTP resources. This only works when Chrome 867 // Enables a live-reload for local NTP resources. This only works when Chrome
868 // is running from a Chrome source directory. 868 // is running from a Chrome source directory.
869 const char kLocalNtpReload[] = "local-ntp-reload"; 869 const char kLocalNtpReload[] = "local-ntp-reload";
870 #endif 870 #endif
871 871
872 #if defined(OS_ANDROID) 872 #if defined(OS_ANDROID)
873 // Android authentication account type for SPNEGO authentication 873 // Android authentication account type for SPNEGO authentication
874 const char kAuthAndroidNegotiateAccountType[] = "auth-spnego-account-type"; 874 const char kAuthAndroidNegotiateAccountType[] = "auth-spnego-account-type";
875 875
876 // Disable App Link.
877 const char kDisableAppLink[] = "disable-app-link";
878
879 // Disables Contextual Search. 876 // Disables Contextual Search.
880 const char kDisableContextualSearch[] = "disable-contextual-search"; 877 const char kDisableContextualSearch[] = "disable-contextual-search";
881 878
882 // Enable the accessibility tab switcher. 879 // Enable the accessibility tab switcher.
883 const char kEnableAccessibilityTabSwitcher[] = 880 const char kEnableAccessibilityTabSwitcher[] =
884 "enable-accessibility-tab-switcher"; 881 "enable-accessibility-tab-switcher";
885 882
886 // Enable App Link.
887 const char kEnableAppLink[] = "enable-app-link";
888
889 // Enables Contextual Search. 883 // Enables Contextual Search.
890 const char kEnableContextualSearch[] = "enable-contextual-search"; 884 const char kEnableContextualSearch[] = "enable-contextual-search";
891 885
892 // Enables Contextual Search UI integration with Contextual Cards data. 886 // Enables Contextual Search UI integration with Contextual Cards data.
893 const char kEnableContextualSearchContextualCardsBarIntegration[] = 887 const char kEnableContextualSearchContextualCardsBarIntegration[] =
894 "cs-contextual-cards-bar-integration"; 888 "cs-contextual-cards-bar-integration";
895 889
896 // Enables chrome hosted mode for Android. 890 // Enables chrome hosted mode for Android.
897 const char kEnableHostedMode[] = "enable-hosted-mode"; 891 const char kEnableHostedMode[] = "enable-hosted-mode";
898 892
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 1162
1169 // ----------------------------------------------------------------------------- 1163 // -----------------------------------------------------------------------------
1170 // DO NOT ADD YOUR VERY NICE FLAGS TO THE BOTTOM OF THIS FILE. 1164 // DO NOT ADD YOUR VERY NICE FLAGS TO THE BOTTOM OF THIS FILE.
1171 // 1165 //
1172 // You were going to just dump your switches here, weren't you? Instead, please 1166 // You were going to just dump your switches here, weren't you? Instead, please
1173 // put them in alphabetical order above, or in order inside the appropriate 1167 // put them in alphabetical order above, or in order inside the appropriate
1174 // ifdef at the bottom. The order should match the header. 1168 // ifdef at the bottom. The order should match the header.
1175 // ----------------------------------------------------------------------------- 1169 // -----------------------------------------------------------------------------
1176 1170
1177 } // namespace switches 1171 } // 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