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

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

Issue 2677023003: Clean up IconNTP-related code (Closed)
Patch Set: 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
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 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after
1072 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME, 1072 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME,
1073 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, kOsAll, 1073 IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION, kOsAll,
1074 MULTI_VALUE_TYPE(kOverscrollHistoryNavigationChoices)}, 1074 MULTI_VALUE_TYPE(kOverscrollHistoryNavigationChoices)},
1075 #endif // USE_AURA 1075 #endif // USE_AURA
1076 {"scroll-end-effect", IDS_FLAGS_SCROLL_END_EFFECT_NAME, 1076 {"scroll-end-effect", IDS_FLAGS_SCROLL_END_EFFECT_NAME,
1077 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, kOsCrOS, 1077 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, kOsCrOS,
1078 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kScrollEndEffect, 1078 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kScrollEndEffect,
1079 "1", 1079 "1",
1080 switches::kScrollEndEffect, 1080 switches::kScrollEndEffect,
1081 "0")}, 1081 "0")},
1082 {"enable-icon-ntp", IDS_FLAGS_ICON_NTP_NAME, IDS_FLAGS_ICON_NTP_DESCRIPTION,
1083 kOsAll, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableIconNtp,
1084 switches::kDisableIconNtp)},
1085 {"enable-touch-drag-drop", IDS_FLAGS_TOUCH_DRAG_DROP_NAME, 1082 {"enable-touch-drag-drop", IDS_FLAGS_TOUCH_DRAG_DROP_NAME,
1086 IDS_FLAGS_TOUCH_DRAG_DROP_DESCRIPTION, kOsWin | kOsCrOS, 1083 IDS_FLAGS_TOUCH_DRAG_DROP_DESCRIPTION, kOsWin | kOsCrOS,
1087 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, 1084 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop,
1088 switches::kDisableTouchDragDrop)}, 1085 switches::kDisableTouchDragDrop)},
1089 {"touch-selection-strategy", IDS_FLAGS_TOUCH_SELECTION_STRATEGY_NAME, 1086 {"touch-selection-strategy", IDS_FLAGS_TOUCH_SELECTION_STRATEGY_NAME,
1090 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DESCRIPTION, 1087 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DESCRIPTION,
1091 kOsAndroid, // TODO(mfomitchev): Add CrOS/Win/Linux support soon. 1088 kOsAndroid, // TODO(mfomitchev): Add CrOS/Win/Linux support soon.
1092 MULTI_VALUE_TYPE(kTouchTextSelectionStrategyChoices)}, 1089 MULTI_VALUE_TYPE(kTouchTextSelectionStrategyChoices)},
1093 {"enable-navigation-tracing", IDS_FLAGS_ENABLE_NAVIGATION_TRACING, 1090 {"enable-navigation-tracing", IDS_FLAGS_ENABLE_NAVIGATION_TRACING,
1094 IDS_FLAGS_ENABLE_NAVIGATION_TRACING_DESCRIPTION, kOsAll, 1091 IDS_FLAGS_ENABLE_NAVIGATION_TRACING_DESCRIPTION, kOsAll,
(...skipping 1300 matching lines...) Expand 10 before | Expand all | Expand 10 after
2395 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2392 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2396 2393
2397 const FeatureEntry* GetFeatureEntries(size_t* count) { 2394 const FeatureEntry* GetFeatureEntries(size_t* count) {
2398 *count = arraysize(kFeatureEntries); 2395 *count = arraysize(kFeatureEntries);
2399 return kFeatureEntries; 2396 return kFeatureEntries;
2400 } 2397 }
2401 2398
2402 } // namespace testing 2399 } // namespace testing
2403 2400
2404 } // namespace about_flags 2401 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/search/local_ntp_source.cc » ('j') | chrome/browser/search/local_ntp_source.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698