Chromium Code Reviews| 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 1532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1543 }, | 1543 }, |
| 1544 #endif | 1544 #endif |
| 1545 { | 1545 { |
| 1546 "enable-streamlined-hosted-apps", | 1546 "enable-streamlined-hosted-apps", |
| 1547 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_NAME, | 1547 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_NAME, |
| 1548 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_DESCRIPTION, | 1548 IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_DESCRIPTION, |
| 1549 kOsWin | kOsCrOS | kOsLinux, | 1549 kOsWin | kOsCrOS | kOsLinux, |
| 1550 SINGLE_VALUE_TYPE(switches::kEnableStreamlinedHostedApps) | 1550 SINGLE_VALUE_TYPE(switches::kEnableStreamlinedHostedApps) |
| 1551 }, | 1551 }, |
| 1552 { | 1552 { |
| 1553 "enable-prominent-url-app-flow", | |
| 1554 IDS_FLAGS_ENABLE_PROMINENT_URL_APP_FLOW_NAME, | |
| 1555 IDS_FLAGS_ENABLE_PROMINENT_URL_APP_FLOW_DESCRIPTION, | |
|
calamity
2014/08/21 06:37:30
These should be removed from generated_resources.g
| |
| 1556 kOsWin | kOsCrOS | kOsLinux, | |
| 1557 SINGLE_VALUE_TYPE(switches::kEnableProminentURLAppFlow) | |
| 1558 }, | |
| 1559 { | |
| 1560 "enable-ephemeral-apps", | 1553 "enable-ephemeral-apps", |
| 1561 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_NAME, | 1554 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_NAME, |
| 1562 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_DESCRIPTION, | 1555 IDS_FLAGS_ENABLE_EPHEMERAL_APPS_DESCRIPTION, |
| 1563 kOsAll, | 1556 kOsAll, |
| 1564 SINGLE_VALUE_TYPE(switches::kEnableEphemeralApps) | 1557 SINGLE_VALUE_TYPE(switches::kEnableEphemeralApps) |
| 1565 }, | 1558 }, |
| 1566 { | 1559 { |
| 1567 "enable-linkable-ephemeral-apps", | 1560 "enable-linkable-ephemeral-apps", |
| 1568 IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_NAME, | 1561 IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_NAME, |
| 1569 IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_DESCRIPTION, | 1562 IDS_FLAGS_ENABLE_LINKABLE_EPHEMERAL_APPS_DESCRIPTION, |
| (...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2486 } | 2479 } |
| 2487 | 2480 |
| 2488 const Experiment* GetExperiments(size_t* count) { | 2481 const Experiment* GetExperiments(size_t* count) { |
| 2489 *count = num_experiments; | 2482 *count = num_experiments; |
| 2490 return experiments; | 2483 return experiments; |
| 2491 } | 2484 } |
| 2492 | 2485 |
| 2493 } // namespace testing | 2486 } // namespace testing |
| 2494 | 2487 |
| 2495 } // namespace about_flags | 2488 } // namespace about_flags |
| OLD | NEW |