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

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

Issue 11578044: Enable Search-key modifiers for extended key shortcuts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
949 SINGLE_VALUE_TYPE(ash::switches::kAshNewLockAnimationsEnabled), 949 SINGLE_VALUE_TYPE(ash::switches::kAshNewLockAnimationsEnabled),
950 }, 950 },
951 { 951 {
952 "file-manager-packaged", 952 "file-manager-packaged",
953 IDS_FLAGS_FILE_MANAGER_PACKAGED_NAME, 953 IDS_FLAGS_FILE_MANAGER_PACKAGED_NAME,
954 IDS_FLAGS_FILE_MANAGER_PACKAGED_DESCRIPTION, 954 IDS_FLAGS_FILE_MANAGER_PACKAGED_DESCRIPTION,
955 kOsCrOS, 955 kOsCrOS,
956 SINGLE_VALUE_TYPE(switches::kFileManagerPackaged), 956 SINGLE_VALUE_TYPE(switches::kFileManagerPackaged),
957 }, 957 },
958 { 958 {
959 "enable-chromebook-function-key", 959 "disable-non-search-extended-key-shortcuts",
960 IDS_FLAGS_ENABLE_CHROMEBOOK_FUNCTION_KEY_NAME, 960 IDS_FLAGS_DISABLE_NON_SEARCH_EXTENDED_KEY_SHORCUTS_NAME,
961 IDS_FLAGS_ENABLE_CHROMEBOOK_FUNCTION_KEY_DESCRIPTION, 961 IDS_FLAGS_DISABLE_NON_SEARCH_EXTENDED_KEY_SHORCUTS_DESCRIPTION,
962 kOsCrOS, 962 kOsCrOS,
963 SINGLE_VALUE_TYPE(switches::kEnableChromebookFunctionKey), 963 SINGLE_VALUE_TYPE(switches::kDisableNonSearchExtendedKeyShortcuts),
964 }, 964 },
965 { 965 {
966 "enable-launcher-per-display", 966 "enable-launcher-per-display",
967 IDS_FLAGS_ENABLE_LAUNCHER_PER_DISPLAY_NAME, 967 IDS_FLAGS_ENABLE_LAUNCHER_PER_DISPLAY_NAME,
968 IDS_FLAGS_ENABLE_LAUNCHER_PER_DISPLAY_DESCRIPTION, 968 IDS_FLAGS_ENABLE_LAUNCHER_PER_DISPLAY_DESCRIPTION,
969 kOsCrOS, 969 kOsCrOS,
970 SINGLE_VALUE_TYPE(ash::switches::kAshLauncherPerDisplay), 970 SINGLE_VALUE_TYPE(ash::switches::kAshLauncherPerDisplay),
971 }, 971 },
972 #endif // defined(OS_CHROMEOS) 972 #endif // defined(OS_CHROMEOS)
973 { 973 {
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 } 1631 }
1632 1632
1633 const Experiment* GetExperiments(size_t* count) { 1633 const Experiment* GetExperiments(size_t* count) {
1634 *count = num_experiments; 1634 *count = num_experiments;
1635 return experiments; 1635 return experiments;
1636 } 1636 }
1637 1637
1638 } // namespace testing 1638 } // namespace testing
1639 1639
1640 } // namespace about_flags 1640 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698