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

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

Issue 14043009: Fall back to local page if online NTP fails to load. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix failing unittest & address comments Created 7 years, 7 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/app/generated_resources.grd ('k') | chrome/browser/search/search.cc » ('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) 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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 }, 566 },
567 { 567 {
568 "enable-instant-extended-api", 568 "enable-instant-extended-api",
569 IDS_FLAGS_ENABLE_INSTANT_EXTENDED_API, 569 IDS_FLAGS_ENABLE_INSTANT_EXTENDED_API,
570 IDS_FLAGS_ENABLE_INSTANT_EXTENDED_API_DESCRIPTION, 570 IDS_FLAGS_ENABLE_INSTANT_EXTENDED_API_DESCRIPTION,
571 kOsDesktop, 571 kOsDesktop,
572 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInstantExtendedAPI, 572 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInstantExtendedAPI,
573 switches::kDisableInstantExtendedAPI) 573 switches::kDisableInstantExtendedAPI)
574 }, 574 },
575 { 575 {
576 "enable-local-first-load-ntp",
577 IDS_FLAGS_ENABLE_LOCAL_FIRST_LOAD_NTP,
578 IDS_FLAGS_ENABLE_LOCAL_FIRST_LOAD_NTP_DESCRIPTION,
579 kOsDesktop,
580 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableLocalFirstLoadNTP,
581 switches::kDisableLocalFirstLoadNTP)
582 },
583 {
576 "enable-local-only-instant-extended-api", 584 "enable-local-only-instant-extended-api",
577 IDS_FLAGS_ENABLE_LOCAL_ONLY_INSTANT_EXTENDED_API, 585 IDS_FLAGS_ENABLE_LOCAL_ONLY_INSTANT_EXTENDED_API,
578 IDS_FLAGS_ENABLE_LOCAL_ONLY_INSTANT_EXTENDED_API_DESCRIPTION, 586 IDS_FLAGS_ENABLE_LOCAL_ONLY_INSTANT_EXTENDED_API_DESCRIPTION,
579 kOsDesktop, 587 kOsDesktop,
580 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableLocalOnlyInstantExtendedAPI, 588 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableLocalOnlyInstantExtendedAPI,
581 switches::kDisableLocalOnlyInstantExtendedAPI) 589 switches::kDisableLocalOnlyInstantExtendedAPI)
582 }, 590 },
583 { 591 {
584 "static-ip-config", 592 "static-ip-config",
585 IDS_FLAGS_STATIC_IP_CONFIG_NAME, 593 IDS_FLAGS_STATIC_IP_CONFIG_NAME,
(...skipping 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after
1938 } 1946 }
1939 1947
1940 const Experiment* GetExperiments(size_t* count) { 1948 const Experiment* GetExperiments(size_t* count) {
1941 *count = num_experiments; 1949 *count = num_experiments;
1942 return experiments; 1950 return experiments;
1943 } 1951 }
1944 1952
1945 } // namespace testing 1953 } // namespace testing
1946 1954
1947 } // namespace about_flags 1955 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/search/search.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698