| OLD | NEW |
| 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 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1017 SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader) | 1017 SINGLE_VALUE_TYPE(chromeos::switches::kEnableBackgroundLoader) |
| 1018 }, | 1018 }, |
| 1019 { | 1019 { |
| 1020 "ash-disable-docked-windows", | 1020 "ash-disable-docked-windows", |
| 1021 IDS_FLAGS_DOCKED_WINDOWS_NAME, | 1021 IDS_FLAGS_DOCKED_WINDOWS_NAME, |
| 1022 IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION, | 1022 IDS_FLAGS_DOCKED_WINDOWS_DESCRIPTION, |
| 1023 kOsCrOS, | 1023 kOsCrOS, |
| 1024 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDockedWindows) | 1024 SINGLE_VALUE_TYPE(ash::switches::kAshDisableDockedWindows) |
| 1025 }, | 1025 }, |
| 1026 { | 1026 { |
| 1027 "ash-enable-immersive-fullscreen-all-windows", | 1027 "ash-enable-immersive-fullscreen-all-windows2", |
| 1028 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, | 1028 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_NAME, |
| 1029 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, | 1029 IDS_FLAGS_IMMERSIVE_FULLSCREEN_FOR_ALL_WINDOWS_DESCRIPTION, |
| 1030 kOsCrOS, | 1030 kOsCrOS, |
| 1031 SINGLE_VALUE_TYPE(ash::switches::kAshEnableImmersiveFullscreenForAllWindows) | 1031 ENABLE_DISABLE_VALUE_TYPE( |
| 1032 ash::switches::kAshEnableImmersiveFullscreenForAllWindows, |
| 1033 ash::switches::kAshEnableImmersiveFullscreenForBrowserOnly) |
| 1032 }, | 1034 }, |
| 1033 #endif | 1035 #endif |
| 1034 { | 1036 { |
| 1035 "enable-download-resumption", | 1037 "enable-download-resumption", |
| 1036 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, | 1038 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME, |
| 1037 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, | 1039 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION, |
| 1038 kOsDesktop, | 1040 kOsDesktop, |
| 1039 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) | 1041 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption) |
| 1040 }, | 1042 }, |
| 1041 { | 1043 { |
| (...skipping 1422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2464 } | 2466 } |
| 2465 | 2467 |
| 2466 const Experiment* GetExperiments(size_t* count) { | 2468 const Experiment* GetExperiments(size_t* count) { |
| 2467 *count = num_experiments; | 2469 *count = num_experiments; |
| 2468 return experiments; | 2470 return experiments; |
| 2469 } | 2471 } |
| 2470 | 2472 |
| 2471 } // namespace testing | 2473 } // namespace testing |
| 2472 | 2474 |
| 2473 } // namespace about_flags | 2475 } // namespace about_flags |
| OLD | NEW |