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

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

Issue 1926173002: Erase LinkDisambiguation code on desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another merge conflict Created 4 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
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 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1192 IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, kOsMac, 1192 IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, kOsMac,
1193 SINGLE_VALUE_TYPE(switches::kEnableNativeNotifications)}, 1193 SINGLE_VALUE_TYPE(switches::kEnableNativeNotifications)},
1194 #endif 1194 #endif
1195 #if defined(TOOLKIT_VIEWS) 1195 #if defined(TOOLKIT_VIEWS)
1196 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA 1196 {"disable-views-rect-based-targeting", // FLAGS:RECORD_UMA
1197 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME, 1197 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME,
1198 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION, 1198 IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION,
1199 kOsCrOS | kOsWin | kOsLinux, 1199 kOsCrOS | kOsWin | kOsLinux,
1200 SINGLE_DISABLE_VALUE_TYPE( 1200 SINGLE_DISABLE_VALUE_TYPE(
1201 views::switches::kDisableViewsRectBasedTargeting)}, 1201 views::switches::kDisableViewsRectBasedTargeting)},
1202 {"enable-link-disambiguation-popup",
1203 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME,
1204 IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION, kOsCrOS | kOsWin,
1205 SINGLE_VALUE_TYPE(switches::kEnableLinkDisambiguationPopup)},
1206 #endif 1202 #endif
1207 #if defined(ENABLE_EXTENSIONS) 1203 #if defined(ENABLE_EXTENSIONS)
1208 {"enable-apps-show-on-first-paint", IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_NAME, 1204 {"enable-apps-show-on-first-paint", IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_NAME,
1209 IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION, kOsDesktop, 1205 IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION, kOsDesktop,
1210 SINGLE_VALUE_TYPE(extensions::switches::kEnableAppsShowOnFirstPaint)}, 1206 SINGLE_VALUE_TYPE(extensions::switches::kEnableAppsShowOnFirstPaint)},
1211 #endif 1207 #endif
1212 #if defined(OS_ANDROID) 1208 #if defined(OS_ANDROID)
1213 {"reader-mode-heuristics", IDS_FLAGS_READER_MODE_HEURISTICS_NAME, 1209 {"reader-mode-heuristics", IDS_FLAGS_READER_MODE_HEURISTICS_NAME,
1214 IDS_FLAGS_READER_MODE_HEURISTICS_DESCRIPTION, kOsAndroid, 1210 IDS_FLAGS_READER_MODE_HEURISTICS_DESCRIPTION, kOsAndroid,
1215 MULTI_VALUE_TYPE(kReaderModeHeuristicsChoices)}, 1211 MULTI_VALUE_TYPE(kReaderModeHeuristicsChoices)},
(...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
2024 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2020 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2025 2021
2026 const FeatureEntry* GetFeatureEntries(size_t* count) { 2022 const FeatureEntry* GetFeatureEntries(size_t* count) {
2027 *count = arraysize(kFeatureEntries); 2023 *count = arraysize(kFeatureEntries);
2028 return kFeatureEntries; 2024 return kFeatureEntries;
2029 } 2025 }
2030 2026
2031 } // namespace testing 2027 } // namespace testing
2032 2028
2033 } // namespace about_flags 2029 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698