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

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

Issue 10917278: Remove mouse lock / pointer lock flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 const Experiment::Choice kTouchOptimizedUIChoices[] = { 134 const Experiment::Choice kTouchOptimizedUIChoices[] = {
135 { IDS_FLAGS_TOUCH_OPTIMIZED_UI_AUTOMATIC, "", "" }, 135 { IDS_FLAGS_TOUCH_OPTIMIZED_UI_AUTOMATIC, "", "" },
136 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 136 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
137 switches::kTouchOptimizedUI, 137 switches::kTouchOptimizedUI,
138 switches::kTouchOptimizedUIEnabled }, 138 switches::kTouchOptimizedUIEnabled },
139 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 139 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
140 switches::kTouchOptimizedUI, 140 switches::kTouchOptimizedUI,
141 switches::kTouchOptimizedUIDisabled } 141 switches::kTouchOptimizedUIDisabled }
142 }; 142 };
143 143
144 const Experiment::Choice kPointerLockUIChoices[] = {
145 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
146 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
147 switches::kEnablePointerLock, ""},
148 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
149 switches::kDisablePointerLock, ""}
150 };
151
152 const Experiment::Choice kAsyncDnsChoices[] = { 144 const Experiment::Choice kAsyncDnsChoices[] = {
153 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 145 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
154 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 146 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
155 switches::kDisableAsyncDns, ""}, 147 switches::kDisableAsyncDns, ""},
156 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 148 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
157 switches::kEnableAsyncDns, ""} 149 switches::kEnableAsyncDns, ""}
158 }; 150 };
159 151
160 152
161 // RECORDING USER METRICS FOR FLAGS: 153 // RECORDING USER METRICS FOR FLAGS:
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 kOsAll, 533 kOsAll,
542 SINGLE_VALUE_TYPE(switches::kDisableMediaSource) 534 SINGLE_VALUE_TYPE(switches::kDisableMediaSource)
543 }, 535 },
544 { 536 {
545 "enable-encrypted-media", 537 "enable-encrypted-media",
546 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, 538 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME,
547 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, 539 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION,
548 kOsAll, 540 kOsAll,
549 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) 541 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia)
550 }, 542 },
551 {
552 "enable-pointer-lock",
553 IDS_FLAGS_ENABLE_POINTER_LOCK_NAME,
554 IDS_FLAGS_ENABLE_POINTER_LOCK_DESCRIPTION,
555 kOsAll,
556 MULTI_VALUE_TYPE(kPointerLockUIChoices)
557 },
558 #if defined(USE_ASH) 543 #if defined(USE_ASH)
559 { 544 {
560 "aura-google-dialog-frames", 545 "aura-google-dialog-frames",
561 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME, 546 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME,
562 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION, 547 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION,
563 kOsWin | kOsLinux | kOsCrOS, 548 kOsWin | kOsLinux | kOsCrOS,
564 SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames) 549 SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames)
565 }, 550 },
566 #endif 551 #endif
567 { 552 {
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 kOsLinux | kOsCrOS, 863 kOsLinux | kOsCrOS,
879 SINGLE_VALUE_TYPE(switches::kOldCheckboxStyle), 864 SINGLE_VALUE_TYPE(switches::kOldCheckboxStyle),
880 }, 865 },
881 { 866 {
882 "enable-frameless-constrained-dialogs", 867 "enable-frameless-constrained-dialogs",
883 IDS_FLAGS_ENABLE_FRAMELESS_DIALOG_NAME, 868 IDS_FLAGS_ENABLE_FRAMELESS_DIALOG_NAME,
884 IDS_FLAGS_ENABLE_FRAMELESS_DIALOG_DESCRIPTION, 869 IDS_FLAGS_ENABLE_FRAMELESS_DIALOG_DESCRIPTION,
885 kOsWin | kOsCrOS, 870 kOsWin | kOsCrOS,
886 SINGLE_VALUE_TYPE(switches::kEnableFramelessConstrainedDialogs), 871 SINGLE_VALUE_TYPE(switches::kEnableFramelessConstrainedDialogs),
887 }, 872 },
888 {
889 "disable-non-fullscreen-mouse-lock",
890 IDS_FLAGS_DISABLE_NON_FULLSCREEN_MOUSE_LOCK_NAME,
891 IDS_FLAGS_DISABLE_NON_FULLSCREEN_MOUSE_LOCK_DESCRIPTION,
892 kOsAll,
893 SINGLE_VALUE_TYPE(switches::kDisableNonFullscreenMouseLock),
894 },
895 #if defined(OS_CHROMEOS) 873 #if defined(OS_CHROMEOS)
896 { 874 {
897 "enable-unsupported-bluetooth-devices", 875 "enable-unsupported-bluetooth-devices",
898 IDS_FLAGS_UNSUPPORTED_BLUETOOTH_DEVICES_NAME, 876 IDS_FLAGS_UNSUPPORTED_BLUETOOTH_DEVICES_NAME,
899 IDS_FLAGS_UNSUPPORTED_BLUETOOTH_DEVICES_DESCRIPTION, 877 IDS_FLAGS_UNSUPPORTED_BLUETOOTH_DEVICES_DESCRIPTION,
900 kOsCrOS, 878 kOsCrOS,
901 SINGLE_VALUE_TYPE(switches::kEnableUnsupportedBluetoothDevices) 879 SINGLE_VALUE_TYPE(switches::kEnableUnsupportedBluetoothDevices)
902 }, 880 },
903 #endif 881 #endif
904 { "disable-accelerated-video-decode", 882 { "disable-accelerated-video-decode",
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
1383 } 1361 }
1384 1362
1385 const Experiment* GetExperiments(size_t* count) { 1363 const Experiment* GetExperiments(size_t* count) {
1386 *count = num_experiments; 1364 *count = num_experiments;
1387 return experiments; 1365 return experiments;
1388 } 1366 }
1389 1367
1390 } // namespace testing 1368 } // namespace testing
1391 1369
1392 } // namespace about_flags 1370 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser_browsertest.cc » ('j') | content/renderer/render_thread_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698