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

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

Issue 123743003: Re-enables docked windows by default in M34 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 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 986 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragOffShelf) 997 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDragOffShelf)
998 }, 998 },
999 { 999 {
1000 "enable-background-loader", 1000 "enable-background-loader",
1001 IDS_ENABLE_BACKLOADER_NAME, 1001 IDS_ENABLE_BACKLOADER_NAME,
1002 IDS_ENABLE_BACKLOADER_DESCRIPTION, 1002 IDS_ENABLE_BACKLOADER_DESCRIPTION,
1003 kOsCrOS, 1003 kOsCrOS,
1004 SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader) 1004 SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader)
1005 }, 1005 },
1006 { 1006 {
1007 "ash-enable-docked-windows", 1007 "ash-disable-docked-windows",
1008 IDS_FLAGS_DOCKED_WINDOWS_NAME, 1008 IDS_FLAGS_DOCKED_WINDOWS_NAME,
1009 IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION, 1009 IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION,
1010 kOsCrOS, 1010 kOsCrOS,
1011 SINGLE_VALUE_TYPE(ash::switches::kAshEnableDockedWindows) 1011 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDockedWindows)
1012 }, 1012 },
1013 { 1013 {
1014 "ash-enable-immersive-fullscreen-all-windows", 1014 "ash-enable-immersive-fullscreen-all-windows",
1015 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, 1015 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME,
1016 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, 1016 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION,
1017 kOsCrOS, 1017 kOsCrOS,
1018 SINGLE_VALUE_TYPE(ash::switches::kAshEnableImmersiveFullscreenForAllWindows) 1018 SINGLE_VALUE_TYPE(ash::switches::kAshEnableImmersiveFullscreenForAllWindows)
1019 }, 1019 },
1020 #endif 1020 #endif
1021 { 1021 {
(...skipping 1433 matching lines...) Expand 10 before | Expand all | Expand 10 after
2455 } 2455 }
2456 2456
2457 const Experiment* GetExperiments(size_t* count) { 2457 const Experiment* GetExperiments(size_t* count) {
2458 *count = num_experiments; 2458 *count = num_experiments;
2459 return experiments; 2459 return experiments;
2460 } 2460 }
2461 2461
2462 } // namespace testing 2462 } // namespace testing
2463 2463
2464 } // namespace about_flags 2464 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698