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

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

Issue 14584004: Remove ash-disable-launcher-per-display flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after
1071 SINGLE_VALUE_TYPE(switches::kFileManagerLegacy), 1071 SINGLE_VALUE_TYPE(switches::kFileManagerLegacy),
1072 }, 1072 },
1073 { 1073 {
1074 "file-manager-legacy-ui", 1074 "file-manager-legacy-ui",
1075 IDS_FLAGS_FILE_MANAGER_LEGACY_UI_NAME, 1075 IDS_FLAGS_FILE_MANAGER_LEGACY_UI_NAME,
1076 IDS_FLAGS_FILE_MANAGER_LEGACY_UI_DESCRIPTION, 1076 IDS_FLAGS_FILE_MANAGER_LEGACY_UI_DESCRIPTION,
1077 kOsCrOS, 1077 kOsCrOS,
1078 SINGLE_VALUE_TYPE(switches::kFileManagerLegacyUI), 1078 SINGLE_VALUE_TYPE(switches::kFileManagerLegacyUI),
1079 }, 1079 },
1080 { 1080 {
1081 "disable-launcher-per-display",
1082 IDS_FLAGS_DISABLE_LAUNCHER_PER_DISPLAY_NAME,
1083 IDS_FLAGS_DISABLE_LAUNCHER_PER_DISPLAY_DESCRIPTION,
1084 kOsCrOS,
1085 SINGLE_VALUE_TYPE(ash::switches::kAshDisableLauncherPerDisplay),
1086 },
1087 {
1088 "disable-app-mode", 1081 "disable-app-mode",
1089 IDS_FLAGS_DISABLE_KIOSK_APPS_NAME, 1082 IDS_FLAGS_DISABLE_KIOSK_APPS_NAME,
1090 IDS_FLAGS_DISABLE_KIOSK_APPS_DESCRIPTION, 1083 IDS_FLAGS_DISABLE_KIOSK_APPS_DESCRIPTION,
1091 kOsCrOSOwnerOnly, 1084 kOsCrOSOwnerOnly,
1092 SINGLE_VALUE_TYPE(switches::kDisableAppMode), 1085 SINGLE_VALUE_TYPE(switches::kDisableAppMode),
1093 }, 1086 },
1094 { 1087 {
1095 "disable-force-fullscreen-app", 1088 "disable-force-fullscreen-app",
1096 IDS_FLAGS_DISABLE_FULLSCREEN_APP_NAME, 1089 IDS_FLAGS_DISABLE_FULLSCREEN_APP_NAME,
1097 IDS_FLAGS_DISABLE_FULLSCREEN_APP_DESCRIPTION, 1090 IDS_FLAGS_DISABLE_FULLSCREEN_APP_DESCRIPTION,
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after
1959 } 1952 }
1960 1953
1961 const Experiment* GetExperiments(size_t* count) { 1954 const Experiment* GetExperiments(size_t* count) {
1962 *count = num_experiments; 1955 *count = num_experiments;
1963 return experiments; 1956 return experiments;
1964 } 1957 }
1965 1958
1966 } // namespace testing 1959 } // namespace testing
1967 1960
1968 } // namespace about_flags 1961 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698