| 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> |
| 11 | 11 |
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/memory/singleton.h" | 13 #include "base/memory/singleton.h" |
| 14 #include "base/string_number_conversions.h" | 14 #include "base/string_number_conversions.h" |
| 15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 16 #include "base/values.h" | 16 #include "base/values.h" |
| 17 #include "chrome/browser/prefs/pref_service.h" | 17 #include "chrome/browser/prefs/pref_service.h" |
| 18 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 18 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 19 #include "chrome/common/chrome_content_client.h" | 19 #include "chrome/common/chrome_content_client.h" |
| 20 #include "chrome/common/chrome_switches.h" | 20 #include "chrome/common/chrome_switches.h" |
| 21 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
| 22 #include "content/public/browser/user_metrics.h" | 22 #include "content/public/browser/user_metrics.h" |
| 23 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
| 24 #include "ui/app_list/app_list_switches.h" |
| 24 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
| 25 #include "ui/base/ui_base_switches.h" | 26 #include "ui/base/ui_base_switches.h" |
| 26 #include "ui/gl/gl_switches.h" | 27 #include "ui/gl/gl_switches.h" |
| 27 | 28 |
| 28 #if defined(USE_ASH) | 29 #if defined(USE_ASH) |
| 29 #include "ash/ash_switches.h" | 30 #include "ash/ash_switches.h" |
| 30 #endif | 31 #endif |
| 31 | 32 |
| 32 #if defined(USE_AURA) | 33 #if defined(USE_AURA) |
| 33 #include "ui/aura/aura_switches.h" | 34 #include "ui/aura/aura_switches.h" |
| (...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 755 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, | 756 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, |
| 756 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, | 757 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, |
| 757 kOsAll, | 758 kOsAll, |
| 758 SINGLE_VALUE_TYPE(switches::kEnablePinch), | 759 SINGLE_VALUE_TYPE(switches::kEnablePinch), |
| 759 }, | 760 }, |
| 760 { | 761 { |
| 761 "app-list-show-apps-only", | 762 "app-list-show-apps-only", |
| 762 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_NAME, | 763 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_NAME, |
| 763 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_DESCRIPTION, | 764 IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_DESCRIPTION, |
| 764 kOsAll, | 765 kOsAll, |
| 765 SINGLE_VALUE_TYPE(ash::switches::kAppListShowAppsOnly), | 766 SINGLE_VALUE_TYPE(app_list::switches::kAppListShowAppsOnly), |
| 766 }, | 767 }, |
| 767 { | 768 { |
| 768 "ash-extended-desktop", | 769 "ash-extended-desktop", |
| 769 IDS_FLAGS_ENABLE_ASH_EXTENDED_DESKTOP_NAME, | 770 IDS_FLAGS_ENABLE_ASH_EXTENDED_DESKTOP_NAME, |
| 770 IDS_FLAGS_ENABLE_ASH_EXTENDED_DESKTOP_DESCRIPTION, | 771 IDS_FLAGS_ENABLE_ASH_EXTENDED_DESKTOP_DESCRIPTION, |
| 771 kOsAll, | 772 kOsAll, |
| 772 SINGLE_VALUE_TYPE(ash::switches::kAshExtendedDesktop) | 773 SINGLE_VALUE_TYPE(ash::switches::kAshExtendedDesktop) |
| 773 }, | 774 }, |
| 774 #endif // defined(USE_ASH) | 775 #endif // defined(USE_ASH) |
| 775 #if defined(OS_CHROMEOS) | 776 #if defined(OS_CHROMEOS) |
| (...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1289 } | 1290 } |
| 1290 | 1291 |
| 1291 const Experiment* GetExperiments(size_t* count) { | 1292 const Experiment* GetExperiments(size_t* count) { |
| 1292 *count = num_experiments; | 1293 *count = num_experiments; |
| 1293 return experiments; | 1294 return experiments; |
| 1294 } | 1295 } |
| 1295 | 1296 |
| 1296 } // namespace testing | 1297 } // namespace testing |
| 1297 | 1298 |
| 1298 } // namespace about_flags | 1299 } // namespace about_flags |
| OLD | NEW |