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 2099903002: Make tile size a function of the device scale factor. Base URL: https://chromium.googlesource.com/chromium/src.git@layouttests-display
Patch Set: tilesize: . Created 4 years, 5 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 error_page::switches::kShowSavedCopy, 228 error_page::switches::kShowSavedCopy,
229 error_page::switches::kEnableShowSavedCopyPrimary }, 229 error_page::switches::kEnableShowSavedCopyPrimary },
230 { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_SECONDARY, 230 { IDS_FLAGS_ENABLE_SHOW_SAVED_COPY_SECONDARY,
231 error_page::switches::kShowSavedCopy, 231 error_page::switches::kShowSavedCopy,
232 error_page::switches::kEnableShowSavedCopySecondary }, 232 error_page::switches::kEnableShowSavedCopySecondary },
233 { IDS_FLAGS_DISABLE_SHOW_SAVED_COPY, 233 { IDS_FLAGS_DISABLE_SHOW_SAVED_COPY,
234 error_page::switches::kShowSavedCopy, 234 error_page::switches::kShowSavedCopy,
235 error_page::switches::kDisableShowSavedCopy } 235 error_page::switches::kDisableShowSavedCopy }
236 }; 236 };
237 237
238 const FeatureEntry::Choice kDefaultTileWidthChoices[] = {
239 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
240 { IDS_FLAGS_DEFAULT_TILE_WIDTH_SHORT,
241 switches::kDefaultTileWidth, "128"},
242 { IDS_FLAGS_DEFAULT_TILE_WIDTH_TALL,
243 switches::kDefaultTileWidth, "256"},
244 { IDS_FLAGS_DEFAULT_TILE_WIDTH_GRANDE,
245 switches::kDefaultTileWidth, "512"},
246 { IDS_FLAGS_DEFAULT_TILE_WIDTH_VENTI,
247 switches::kDefaultTileWidth, "1024"}
248 };
249
250 const FeatureEntry::Choice kDefaultTileHeightChoices[] = { 238 const FeatureEntry::Choice kDefaultTileHeightChoices[] = {
251 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 239 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
252 { IDS_FLAGS_DEFAULT_TILE_HEIGHT_SHORT, 240 { IDS_FLAGS_DEFAULT_TILE_HEIGHT_SHORT,
253 switches::kDefaultTileHeight, "128"}, 241 switches::kDefaultTileHeight, "128"},
254 { IDS_FLAGS_DEFAULT_TILE_HEIGHT_TALL, 242 { IDS_FLAGS_DEFAULT_TILE_HEIGHT_TALL,
255 switches::kDefaultTileHeight, "256"}, 243 switches::kDefaultTileHeight, "256"},
256 { IDS_FLAGS_DEFAULT_TILE_HEIGHT_GRANDE, 244 { IDS_FLAGS_DEFAULT_TILE_HEIGHT_GRANDE,
257 switches::kDefaultTileHeight, "512"}, 245 switches::kDefaultTileHeight, "512"},
258 { IDS_FLAGS_DEFAULT_TILE_HEIGHT_VENTI, 246 { IDS_FLAGS_DEFAULT_TILE_HEIGHT_VENTI,
259 switches::kDefaultTileHeight, "1024"} 247 switches::kDefaultTileHeight, "1024"}
(...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReload, 1056 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReload,
1069 switches::kDisableOfflineAutoReload)}, 1057 switches::kDisableOfflineAutoReload)},
1070 {"enable-offline-auto-reload-visible-only", 1058 {"enable-offline-auto-reload-visible-only",
1071 IDS_FLAGS_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_NAME, 1059 IDS_FLAGS_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_NAME,
1072 IDS_FLAGS_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_DESCRIPTION, kOsAll, 1060 IDS_FLAGS_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_DESCRIPTION, kOsAll,
1073 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReloadVisibleOnly, 1061 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReloadVisibleOnly,
1074 switches::kDisableOfflineAutoReloadVisibleOnly)}, 1062 switches::kDisableOfflineAutoReloadVisibleOnly)},
1075 {"show-saved-copy", IDS_FLAGS_SHOW_SAVED_COPY_NAME, 1063 {"show-saved-copy", IDS_FLAGS_SHOW_SAVED_COPY_NAME,
1076 IDS_FLAGS_SHOW_SAVED_COPY_DESCRIPTION, kOsAll, 1064 IDS_FLAGS_SHOW_SAVED_COPY_DESCRIPTION, kOsAll,
1077 MULTI_VALUE_TYPE(kShowSavedCopyChoices)}, 1065 MULTI_VALUE_TYPE(kShowSavedCopyChoices)},
1078 {"default-tile-width", IDS_FLAGS_DEFAULT_TILE_WIDTH_NAME,
1079 IDS_FLAGS_DEFAULT_TILE_WIDTH_DESCRIPTION, kOsAll,
1080 MULTI_VALUE_TYPE(kDefaultTileWidthChoices)},
1081 {"default-tile-height", IDS_FLAGS_DEFAULT_TILE_HEIGHT_NAME,
1082 IDS_FLAGS_DEFAULT_TILE_HEIGHT_DESCRIPTION, kOsAll,
1083 MULTI_VALUE_TYPE(kDefaultTileHeightChoices)},
1084 {"disable-gesture-requirement-for-media-playback", 1066 {"disable-gesture-requirement-for-media-playback",
1085 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, 1067 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME,
1086 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, kOsAll, 1068 IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, kOsAll,
1087 SINGLE_DISABLE_VALUE_TYPE( 1069 SINGLE_DISABLE_VALUE_TYPE(
1088 switches::kDisableGestureRequirementForMediaPlayback)}, 1070 switches::kDisableGestureRequirementForMediaPlayback)},
1089 #if defined(OS_CHROMEOS) 1071 #if defined(OS_CHROMEOS)
1090 {"enable-virtual-keyboard", IDS_FLAGS_VIRTUAL_KEYBOARD_NAME, 1072 {"enable-virtual-keyboard", IDS_FLAGS_VIRTUAL_KEYBOARD_NAME,
1091 IDS_FLAGS_VIRTUAL_KEYBOARD_DESCRIPTION, kOsCrOS, 1073 IDS_FLAGS_VIRTUAL_KEYBOARD_DESCRIPTION, kOsCrOS,
1092 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)}, 1074 SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)},
1093 {"virtual-keyboard-overscroll", IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_NAME, 1075 {"virtual-keyboard-overscroll", IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_NAME,
(...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after
2159 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2141 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2160 2142
2161 const FeatureEntry* GetFeatureEntries(size_t* count) { 2143 const FeatureEntry* GetFeatureEntries(size_t* count) {
2162 *count = arraysize(kFeatureEntries); 2144 *count = arraysize(kFeatureEntries);
2163 return kFeatureEntries; 2145 return kFeatureEntries;
2164 } 2146 }
2165 2147
2166 } // namespace testing 2148 } // namespace testing
2167 2149
2168 } // namespace about_flags 2150 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698