| 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 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 575 SINGLE_VALUE_TYPE(switches::kEnableExtensionActivityUI) | 575 SINGLE_VALUE_TYPE(switches::kEnableExtensionActivityUI) |
| 576 }, | 576 }, |
| 577 { | 577 { |
| 578 "webui-task-manager", | 578 "webui-task-manager", |
| 579 IDS_FLAGS_WEBUI_TASK_MANAGER_NAME, | 579 IDS_FLAGS_WEBUI_TASK_MANAGER_NAME, |
| 580 IDS_FLAGS_WEBUI_TASK_MANAGER_DESCRIPTION, | 580 IDS_FLAGS_WEBUI_TASK_MANAGER_DESCRIPTION, |
| 581 kOsAll, | 581 kOsAll, |
| 582 SINGLE_VALUE_TYPE(switches::kWebUITaskManager) | 582 SINGLE_VALUE_TYPE(switches::kWebUITaskManager) |
| 583 }, | 583 }, |
| 584 { | 584 { |
| 585 "disable-ntp-other-sessions-menu", | 585 "enable-ntp-other-sessions-menu", |
| 586 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, | 586 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME, |
| 587 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, | 587 IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION, |
| 588 kOsAll, | 588 kOsAll, |
| 589 SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu) | 589 SINGLE_VALUE_TYPE(switches::kEnableNTPOtherSessionsMenu) |
| 590 }, | 590 }, |
| 591 #if defined(USE_AURA) | 591 #if defined(USE_AURA) |
| 592 { | 592 { |
| 593 "enable-ash-uber-tray", | 593 "enable-ash-uber-tray", |
| 594 IDS_FLAGS_ENABLE_ASH_UBER_TRAY_NAME, | 594 IDS_FLAGS_ENABLE_ASH_UBER_TRAY_NAME, |
| 595 IDS_FLAGS_ENABLE_ASH_UBER_TRAY_DESCRIPTION, | 595 IDS_FLAGS_ENABLE_ASH_UBER_TRAY_DESCRIPTION, |
| 596 kOsAll, | 596 kOsAll, |
| 597 SINGLE_VALUE_TYPE(ash::switches::kAshUberTray), | 597 SINGLE_VALUE_TYPE(ash::switches::kAshUberTray), |
| 598 }, | 598 }, |
| 599 #endif | 599 #endif |
| (...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1042 } | 1042 } |
| 1043 | 1043 |
| 1044 const Experiment* GetExperiments(size_t* count) { | 1044 const Experiment* GetExperiments(size_t* count) { |
| 1045 *count = num_experiments; | 1045 *count = num_experiments; |
| 1046 return experiments; | 1046 return experiments; |
| 1047 } | 1047 } |
| 1048 | 1048 |
| 1049 } // namespace testing | 1049 } // namespace testing |
| 1050 | 1050 |
| 1051 } // namespace about_flags | 1051 } // namespace about_flags |
| OLD | NEW |