| 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 1536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1547 { | 1547 { |
| 1548 "high-dpi-support", | 1548 "high-dpi-support", |
| 1549 IDS_FLAGS_HIDPI_NAME, | 1549 IDS_FLAGS_HIDPI_NAME, |
| 1550 IDS_FLAGS_HIDPI_DESCRIPTION, | 1550 IDS_FLAGS_HIDPI_DESCRIPTION, |
| 1551 kOsWin, | 1551 kOsWin, |
| 1552 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kHighDPISupport,"1", | 1552 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kHighDPISupport,"1", |
| 1553 switches::kHighDPISupport,"0") | 1553 switches::kHighDPISupport,"0") |
| 1554 }, | 1554 }, |
| 1555 #if defined(OS_CHROMEOS) | 1555 #if defined(OS_CHROMEOS) |
| 1556 { | 1556 { |
| 1557 "enable-quickoffice-editing", | 1557 "enable-quickoffice-viewing", |
| 1558 IDS_FLAGS_ENABLE_QUICKOFFICE_DESKTOP_EDIT_NAME, | 1558 IDS_FLAGS_ENABLE_QUICKOFFICE_DESKTOP_VIEWING_NAME, |
| 1559 IDS_FLAGS_ENABLE_QUICKOFFICE_DESKTOP_EDIT_DESCRIPTION, | 1559 IDS_FLAGS_ENABLE_QUICKOFFICE_DESKTOP_VIEWING_DESCRIPTION, |
| 1560 kOsCrOS, | 1560 kOsCrOS, |
| 1561 SINGLE_VALUE_TYPE(switches::kEnableQuickofficeEdit), | 1561 SINGLE_VALUE_TYPE(switches::kEnableQuickofficeViewing), |
| 1562 }, | 1562 }, |
| 1563 { | 1563 { |
| 1564 "enable-sticky-keys", | 1564 "enable-sticky-keys", |
| 1565 IDS_FLAGS_ENABLE_STICKY_KEYS_NAME, | 1565 IDS_FLAGS_ENABLE_STICKY_KEYS_NAME, |
| 1566 IDS_FLAGS_ENABLE_STICKY_KEYS_DESCRIPTION, | 1566 IDS_FLAGS_ENABLE_STICKY_KEYS_DESCRIPTION, |
| 1567 kOsCrOS, | 1567 kOsCrOS, |
| 1568 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableStickyKeys, | 1568 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableStickyKeys, |
| 1569 switches::kDisableStickyKeys) | 1569 switches::kDisableStickyKeys) |
| 1570 }, | 1570 }, |
| 1571 #endif | 1571 #endif |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2106 } | 2106 } |
| 2107 | 2107 |
| 2108 const Experiment* GetExperiments(size_t* count) { | 2108 const Experiment* GetExperiments(size_t* count) { |
| 2109 *count = num_experiments; | 2109 *count = num_experiments; |
| 2110 return experiments; | 2110 return experiments; |
| 2111 } | 2111 } |
| 2112 | 2112 |
| 2113 } // namespace testing | 2113 } // namespace testing |
| 2114 | 2114 |
| 2115 } // namespace about_flags | 2115 } // namespace about_flags |
| OLD | NEW |