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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1407 { | 1407 { |
| 1408 "enable-cloud-print-xps", | 1408 "enable-cloud-print-xps", |
| 1409 IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_NAME, | 1409 IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_NAME, |
| 1410 IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_DESCRIPTION, | 1410 IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_DESCRIPTION, |
| 1411 kOsWin, | 1411 kOsWin, |
| 1412 SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps) | 1412 SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps) |
| 1413 }, | 1413 }, |
| 1414 #endif | 1414 #endif |
| 1415 #if defined(OS_MACOSX) | 1415 #if defined(OS_MACOSX) |
| 1416 { | 1416 { |
| 1417 "apps-keep-chrome-alive", | |
|
tapted
2014/04/01 08:09:45
nit: new flags should be added to the end of kExpe
jackhou1
2014/04/02 06:38:38
Done.
| |
| 1418 IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_NAME, | |
| 1419 IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_DESCRIPTION, | |
| 1420 kOsMac, | |
| 1421 SINGLE_VALUE_TYPE(switches::kAppsKeepChromeAlive) | |
| 1422 }, | |
| 1423 { | |
| 1417 "disable-app-shims", | 1424 "disable-app-shims", |
| 1418 IDS_FLAGS_DISABLE_APP_SHIMS_NAME, | 1425 IDS_FLAGS_DISABLE_APP_SHIMS_NAME, |
| 1419 IDS_FLAGS_DISABLE_APP_SHIMS_DESCRIPTION, | 1426 IDS_FLAGS_DISABLE_APP_SHIMS_DESCRIPTION, |
| 1420 kOsMac, | 1427 kOsMac, |
| 1421 SINGLE_VALUE_TYPE(switches::kDisableAppShims) | 1428 SINGLE_VALUE_TYPE(switches::kDisableAppShims) |
| 1422 }, | 1429 }, |
| 1423 { | 1430 { |
| 1424 "enable-simplified-fullscreen", | 1431 "enable-simplified-fullscreen", |
| 1425 IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_NAME, | 1432 IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_NAME, |
| 1426 IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_DESCRIPTION, | 1433 IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_DESCRIPTION, |
| (...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2364 } | 2371 } |
| 2365 | 2372 |
| 2366 const Experiment* GetExperiments(size_t* count) { | 2373 const Experiment* GetExperiments(size_t* count) { |
| 2367 *count = num_experiments; | 2374 *count = num_experiments; |
| 2368 return experiments; | 2375 return experiments; |
| 2369 } | 2376 } |
| 2370 | 2377 |
| 2371 } // namespace testing | 2378 } // namespace testing |
| 2372 | 2379 |
| 2373 } // namespace about_flags | 2380 } // namespace about_flags |
| OLD | NEW |