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

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

Issue 2296043003: Rename Lo-Fi previews to lite pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@newLoFiInfoBarAddTests
Patch Set: tbansal comments Created 4 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
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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 1539 matching lines...) Expand 10 before | Expand all | Expand 10 after
1550 #if defined(OS_CHROMEOS) 1550 #if defined(OS_CHROMEOS)
1551 {"disable-timezone-tracking", 1551 {"disable-timezone-tracking",
1552 IDS_FLAGS_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME, 1552 IDS_FLAGS_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME,
1553 IDS_FLAGS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, kOsCrOS, 1553 IDS_FLAGS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION, kOsCrOS,
1554 SINGLE_DISABLE_VALUE_TYPE( 1554 SINGLE_DISABLE_VALUE_TYPE(
1555 chromeos::switches::kDisableTimeZoneTrackingOption)}, 1555 chromeos::switches::kDisableTimeZoneTrackingOption)},
1556 #endif // OS_CHROMEOS 1556 #endif // OS_CHROMEOS
1557 {"data-reduction-proxy-lo-fi", IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_NAME, 1557 {"data-reduction-proxy-lo-fi", IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_NAME,
1558 IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_DESCRIPTION, kOsAll, 1558 IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_DESCRIPTION, kOsAll,
1559 MULTI_VALUE_TYPE(kDataReductionProxyLoFiChoices)}, 1559 MULTI_VALUE_TYPE(kDataReductionProxyLoFiChoices)},
1560 {"enable-data-reduction-proxy-lo-fi-preview", 1560 {"enable-data-reduction-proxy-lite-page",
1561 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LO_FI_PREVIEW_NAME, 1561 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LITE_PAGE_NAME,
1562 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LO_FI_PREVIEW_DESCRIPTION, kOsAll, 1562 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_LITE_PAGE_DESCRIPTION,
1563 SINGLE_VALUE_TYPE( 1563 kOsAll, SINGLE_VALUE_TYPE(data_reduction_proxy::switches::
1564 data_reduction_proxy::switches::kEnableDataReductionProxyLoFiPreview)}, 1564 kEnableDataReductionProxyLitePage)},
1565 {"clear-data-reduction-proxy-data-savings", 1565 {"clear-data-reduction-proxy-data-savings",
1566 IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_NAME, 1566 IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_NAME,
1567 IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_DESCRIPTION, kOsAll, 1567 IDS_FLAGS_DATA_REDUCTION_PROXY_RESET_SAVINGS_DESCRIPTION, kOsAll,
1568 SINGLE_VALUE_TYPE( 1568 SINGLE_VALUE_TYPE(
1569 data_reduction_proxy::switches::kClearDataReductionProxyDataSavings)}, 1569 data_reduction_proxy::switches::kClearDataReductionProxyDataSavings)},
1570 {"allow-insecure-localhost", IDS_ALLOW_INSECURE_LOCALHOST, 1570 {"allow-insecure-localhost", IDS_ALLOW_INSECURE_LOCALHOST,
1571 IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION, kOsAll, 1571 IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION, kOsAll,
1572 SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost)}, 1572 SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost)},
1573 {"enable-add-to-shelf", IDS_FLAGS_ADD_TO_SHELF_NAME, 1573 {"enable-add-to-shelf", IDS_FLAGS_ADD_TO_SHELF_NAME,
1574 IDS_FLAGS_ADD_TO_SHELF_DESCRIPTION, kOsDesktop, 1574 IDS_FLAGS_ADD_TO_SHELF_DESCRIPTION, kOsDesktop,
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
2146 // builds and the Canary/Dev channel. 2146 // builds and the Canary/Dev channel.
2147 if (!strcmp("enable-data-reduction-proxy-carrier-test", 2147 if (!strcmp("enable-data-reduction-proxy-carrier-test",
2148 entry.internal_name) && 2148 entry.internal_name) &&
2149 channel != version_info::Channel::DEV && 2149 channel != version_info::Channel::DEV &&
2150 channel != version_info::Channel::CANARY && 2150 channel != version_info::Channel::CANARY &&
2151 channel != version_info::Channel::UNKNOWN) { 2151 channel != version_info::Channel::UNKNOWN) {
2152 return true; 2152 return true;
2153 } 2153 }
2154 #endif // OS_ANDROID 2154 #endif // OS_ANDROID
2155 2155
2156 // data-reduction-proxy-lo-fi and enable-data-reduction-proxy-lo-fi-preview 2156 // data-reduction-proxy-lo-fi and enable-data-reduction-proxy-lite-page
2157 // are only available for Chromium builds and the Canary/Dev/Beta channels. 2157 // are only available for Chromium builds and the Canary/Dev/Beta channels.
2158 if ((!strcmp("data-reduction-proxy-lo-fi", entry.internal_name) || 2158 if ((!strcmp("data-reduction-proxy-lo-fi", entry.internal_name) ||
2159 !strcmp("enable-data-reduction-proxy-lo-fi-preview", 2159 !strcmp("enable-data-reduction-proxy-lite-page",
2160 entry.internal_name)) && 2160 entry.internal_name)) &&
2161 channel != version_info::Channel::BETA && 2161 channel != version_info::Channel::BETA &&
2162 channel != version_info::Channel::DEV && 2162 channel != version_info::Channel::DEV &&
2163 channel != version_info::Channel::CANARY && 2163 channel != version_info::Channel::CANARY &&
2164 channel != version_info::Channel::UNKNOWN) { 2164 channel != version_info::Channel::UNKNOWN) {
2165 return true; 2165 return true;
2166 } 2166 }
2167 2167
2168 return false; 2168 return false;
2169 } 2169 }
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
2304 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2304 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2305 2305
2306 const FeatureEntry* GetFeatureEntries(size_t* count) { 2306 const FeatureEntry* GetFeatureEntries(size_t* count) {
2307 *count = arraysize(kFeatureEntries); 2307 *count = arraysize(kFeatureEntries);
2308 return kFeatureEntries; 2308 return kFeatureEntries;
2309 } 2309 }
2310 2310
2311 } // namespace testing 2311 } // namespace testing
2312 2312
2313 } // namespace about_flags 2313 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698