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

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

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 years, 9 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 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), 1103 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts),
1104 }, 1104 },
1105 { 1105 {
1106 "ash-disable-maximize-mode-window-backdrop", 1106 "ash-disable-maximize-mode-window-backdrop",
1107 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME, 1107 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME,
1108 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS, 1108 IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION, kOsCrOS,
1109 SINGLE_DISABLE_VALUE_TYPE( 1109 SINGLE_DISABLE_VALUE_TYPE(
1110 ash::switches::kAshDisableMaximizeModeWindowBackdrop), 1110 ash::switches::kAshDisableMaximizeModeWindowBackdrop),
1111 }, 1111 },
1112 { 1112 {
1113 "ash-enable-docked-windows", IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_NAME,
1114 IDS_FLAGS_ASH_ENABLE_DOCKED_WINDOWS_DESCRIPTION, kOsAll,
1115 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows),
1116 },
1117 {
1118 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME, 1113 "ash-enable-mirrored-screen", IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_NAME,
1119 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS, 1114 IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS,
1120 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen), 1115 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen),
1121 }, 1116 },
1122 {"ash-shelf-color", IDS_FLAGS_ASH_SHELF_COLOR, 1117 {"ash-shelf-color", IDS_FLAGS_ASH_SHELF_COLOR,
1123 IDS_FLAGS_ASH_SHELF_COLOR_DESCRIPTION, kOsCrOS, 1118 IDS_FLAGS_ASH_SHELF_COLOR_DESCRIPTION, kOsCrOS,
1124 MULTI_VALUE_TYPE(kAshShelfColorChoices)}, 1119 MULTI_VALUE_TYPE(kAshShelfColorChoices)},
1125 #endif // USE_ASH 1120 #endif // USE_ASH
1126 #if defined(OS_CHROMEOS) 1121 #if defined(OS_CHROMEOS)
1127 {"material-design-ink-drop-animation-speed", 1122 {"material-design-ink-drop-animation-speed",
(...skipping 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after
2618 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2613 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2619 2614
2620 const FeatureEntry* GetFeatureEntries(size_t* count) { 2615 const FeatureEntry* GetFeatureEntries(size_t* count) {
2621 *count = arraysize(kFeatureEntries); 2616 *count = arraysize(kFeatureEntries);
2622 return kFeatureEntries; 2617 return kFeatureEntries;
2623 } 2618 }
2624 2619
2625 } // namespace testing 2620 } // namespace testing
2626 2621
2627 } // namespace about_flags 2622 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/api/sessions/sessions_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698