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 <iterator> | 7 #include <iterator> |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
59 #include "ui/base/ui_base_switches.h" | 59 #include "ui/base/ui_base_switches.h" |
60 #include "ui/display/display_switches.h" | 60 #include "ui/display/display_switches.h" |
61 #include "ui/events/event_switches.h" | 61 #include "ui/events/event_switches.h" |
62 #include "ui/gfx/switches.h" | 62 #include "ui/gfx/switches.h" |
63 #include "ui/gl/gl_switches.h" | 63 #include "ui/gl/gl_switches.h" |
64 #include "ui/keyboard/keyboard_switches.h" | 64 #include "ui/keyboard/keyboard_switches.h" |
65 #include "ui/native_theme/native_theme_switches.h" | 65 #include "ui/native_theme/native_theme_switches.h" |
66 #include "ui/views/views_switches.h" | 66 #include "ui/views/views_switches.h" |
67 | 67 |
68 #if !defined(OS_ANDROID) | 68 #if !defined(OS_ANDROID) |
69 #include "chrome/browser/android/chrome_feature_list.h" | |
Alexei Svitkine (slow)
2015/12/21 19:02:17
This is a !defined(OS_ANDROID) block. You want a n
cco3
2015/12/21 19:21:00
Done.
| |
69 #include "ui/message_center/message_center_switches.h" | 70 #include "ui/message_center/message_center_switches.h" |
70 #endif | 71 #endif |
71 | 72 |
72 #if defined(OS_CHROMEOS) | 73 #if defined(OS_CHROMEOS) |
73 #include "chromeos/chromeos_switches.h" | 74 #include "chromeos/chromeos_switches.h" |
74 #include "third_party/cros_system_api/switches/chrome_switches.h" | 75 #include "third_party/cros_system_api/switches/chrome_switches.h" |
75 #endif | 76 #endif |
76 | 77 |
77 #if defined(OS_WIN) | 78 #if defined(OS_WIN) |
78 #include "components/search_engines/desktop_search_win.h" | 79 #include "components/search_engines/desktop_search_win.h" |
(...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1318 #if defined(OS_ANDROID) | 1319 #if defined(OS_ANDROID) |
1319 {"enable-accessibility-tab-switcher", | 1320 {"enable-accessibility-tab-switcher", |
1320 IDS_FLAGS_ACCESSIBILITY_TAB_SWITCHER_NAME, | 1321 IDS_FLAGS_ACCESSIBILITY_TAB_SWITCHER_NAME, |
1321 IDS_FLAGS_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, | 1322 IDS_FLAGS_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, |
1322 kOsAndroid, | 1323 kOsAndroid, |
1323 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)}, | 1324 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)}, |
1324 {"enable-physical-web", | 1325 {"enable-physical-web", |
1325 IDS_FLAGS_ENABLE_PHYSICAL_WEB_NAME, | 1326 IDS_FLAGS_ENABLE_PHYSICAL_WEB_NAME, |
1326 IDS_FLAGS_ENABLE_PHYSICAL_WEB_DESCRIPTION, | 1327 IDS_FLAGS_ENABLE_PHYSICAL_WEB_DESCRIPTION, |
1327 kOsAndroid, | 1328 kOsAndroid, |
1328 SINGLE_VALUE_TYPE(switches::kEnablePhysicalWeb)}, | 1329 FEATURE_VALUE_TYPE(chrome::android::kPhysicalWebFeature)}, |
1329 #endif | 1330 #endif |
1330 {"enable-zero-copy", | 1331 {"enable-zero-copy", |
1331 IDS_FLAGS_ZERO_COPY_NAME, | 1332 IDS_FLAGS_ZERO_COPY_NAME, |
1332 IDS_FLAGS_ZERO_COPY_DESCRIPTION, | 1333 IDS_FLAGS_ZERO_COPY_DESCRIPTION, |
1333 kOsAll, | 1334 kOsAll, |
1334 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableZeroCopy, | 1335 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableZeroCopy, |
1335 switches::kDisableZeroCopy)}, | 1336 switches::kDisableZeroCopy)}, |
1336 #if defined(OS_CHROMEOS) | 1337 #if defined(OS_CHROMEOS) |
1337 {"enable-first-run-ui-transitions", | 1338 {"enable-first-run-ui-transitions", |
1338 IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_NAME, | 1339 IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_NAME, |
(...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2292 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2293 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2293 | 2294 |
2294 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2295 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2295 *count = arraysize(kFeatureEntries); | 2296 *count = arraysize(kFeatureEntries); |
2296 return kFeatureEntries; | 2297 return kFeatureEntries; |
2297 } | 2298 } |
2298 | 2299 |
2299 } // namespace testing | 2300 } // namespace testing |
2300 | 2301 |
2301 } // namespace about_flags | 2302 } // namespace about_flags |
OLD | NEW |