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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More test fixes. 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
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/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 SINGLE_VALUE_TYPE(switches::kNoPings) 644 SINGLE_VALUE_TYPE(switches::kNoPings)
645 }, 645 },
646 { 646 {
647 "tab-groups-context-menu", 647 "tab-groups-context-menu",
648 IDS_FLAGS_TAB_GROUPS_CONTEXT_MENU_NAME, 648 IDS_FLAGS_TAB_GROUPS_CONTEXT_MENU_NAME,
649 IDS_FLAGS_TAB_GROUPS_CONTEXT_MENU_DESCRIPTION, 649 IDS_FLAGS_TAB_GROUPS_CONTEXT_MENU_DESCRIPTION,
650 kOsWin, 650 kOsWin,
651 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu) 651 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu)
652 }, 652 },
653 { 653 {
654 "enable-instant-extended-api",
655 IDS_FLAGS_ENABLE_INSTANT_EXTENDED_API,
656 IDS_FLAGS_ENABLE_INSTANT_EXTENDED_API_DESCRIPTION,
657 kOsMac | kOsWin | kOsCrOS,
658 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInstantExtendedAPI,
659 switches::kDisableInstantExtendedAPI)
660 },
661 {
662 "use-cacheable-new-tab-page", 654 "use-cacheable-new-tab-page",
663 IDS_FLAGS_ENABLE_INSTANT_EXTENDED_CACHEABLE_NTP, 655 IDS_FLAGS_ENABLE_INSTANT_EXTENDED_CACHEABLE_NTP,
664 IDS_FLAGS_ENABLE_INSTANT_EXTENDED_CACHEABLE_NTP_DESCRIPTION, 656 IDS_FLAGS_ENABLE_INSTANT_EXTENDED_CACHEABLE_NTP_DESCRIPTION,
665 kOsMac | kOsWin | kOsCrOS, 657 kOsMac | kOsWin | kOsCrOS,
666 SINGLE_VALUE_TYPE(switches::kUseCacheableNewTabPage) 658 SINGLE_VALUE_TYPE(switches::kUseCacheableNewTabPage)
667 }, 659 },
668 {
669 "enable-local-first-load-ntp",
670 IDS_FLAGS_ENABLE_LOCAL_FIRST_LOAD_NTP,
671 IDS_FLAGS_ENABLE_LOCAL_FIRST_LOAD_NTP_DESCRIPTION,
672 kOsMac | kOsWin | kOsCrOS,
673 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableLocalFirstLoadNTP,
674 switches::kDisableLocalFirstLoadNTP)
675 },
676 #if defined(OS_ANDROID) 660 #if defined(OS_ANDROID)
677 { 661 {
678 "enable-new-ntp", 662 "enable-new-ntp",
679 IDS_FLAGS_ENABLE_NEW_NTP, 663 IDS_FLAGS_ENABLE_NEW_NTP,
680 IDS_FLAGS_ENABLE_NEW_NTP_DESCRIPTION, 664 IDS_FLAGS_ENABLE_NEW_NTP_DESCRIPTION,
681 kOsAndroid, 665 kOsAndroid,
682 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewNTP, 666 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewNTP,
683 switches::kDisableNewNTP) 667 switches::kDisableNewNTP)
684 }, 668 },
685 #endif 669 #endif
(...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after
2258 } 2242 }
2259 2243
2260 const Experiment* GetExperiments(size_t* count) { 2244 const Experiment* GetExperiments(size_t* count) {
2261 *count = num_experiments; 2245 *count = num_experiments;
2262 return experiments; 2246 return experiments;
2263 } 2247 }
2264 2248
2265 } // namespace testing 2249 } // namespace testing
2266 2250
2267 } // namespace about_flags 2251 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698