| OLD | NEW | 
|    1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |    1 // Copyright (c) 2010 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 20 matching lines...) Expand all  Loading... | 
|   31     IDS_FLAGS_TABPOSE_DESCRIPTION, |   31     IDS_FLAGS_TABPOSE_DESCRIPTION, | 
|   32     kOsMac, |   32     kOsMac, | 
|   33 #if defined(OS_MACOSX) |   33 #if defined(OS_MACOSX) | 
|   34     // The switch exists only on OS X. |   34     // The switch exists only on OS X. | 
|   35     switches::kEnableExposeForTabs |   35     switches::kEnableExposeForTabs | 
|   36 #else |   36 #else | 
|   37     "" |   37     "" | 
|   38 #endif |   38 #endif | 
|   39   }, |   39   }, | 
|   40   { |   40   { | 
 |   41     "media-player",  // Do not change; see above. | 
 |   42     IDS_FLAGS_MEDIA_PLAYER_NAME, | 
 |   43     IDS_FLAGS_MEDIA_PLAYER_DESCRIPTION, | 
 |   44     kOsCrOS, | 
 |   45 #if defined(OS_CHROMEOS) | 
 |   46     // The switch exists only on Chrome OS. | 
 |   47     switches::kEnableMediaPlayer | 
 |   48 #else | 
 |   49     "" | 
 |   50 #endif | 
 |   51   }, | 
 |   52   { | 
 |   53     "advanced-fs",  // Do not change; see above. | 
 |   54     IDS_FLAGS_ADVANCED_FS_NAME, | 
 |   55     IDS_FLAGS_ADVANCED_FS_DESCRIPTION, | 
 |   56     kOsCrOS, | 
 |   57 #if defined(OS_CHROMEOS) | 
 |   58     // The switch exists only on Chrome OS. | 
 |   59     switches::kEnableAdvancedFileSystem | 
 |   60 #else | 
 |   61     "" | 
 |   62 #endif | 
 |   63   }, | 
 |   64   { | 
|   41     "vertical-tabs",  // Do not change; see above. |   65     "vertical-tabs",  // Do not change; see above. | 
|   42     IDS_FLAGS_SIDE_TABS_NAME, |   66     IDS_FLAGS_SIDE_TABS_NAME, | 
|   43     IDS_FLAGS_SIDE_TABS_DESCRIPTION, |   67     IDS_FLAGS_SIDE_TABS_DESCRIPTION, | 
|   44     // TODO(thakis): Move sidetabs to about:flags on ChromeOS |   68     kOsWin | kOsCrOS, | 
|   45     // http://crbug.com/57634 |  | 
|   46     kOsWin, |  | 
|   47     switches::kEnableVerticalTabs |   69     switches::kEnableVerticalTabs | 
|   48   }, |   70   }, | 
|   49   { |   71   { | 
|   50     "tabbed-options",  // Do not change; see above. |   72     "tabbed-options",  // Do not change; see above. | 
|   51     IDS_FLAGS_TABBED_OPTIONS_NAME, |   73     IDS_FLAGS_TABBED_OPTIONS_NAME, | 
|   52     IDS_FLAGS_TABBED_OPTIONS_DESCRIPTION, |   74     IDS_FLAGS_TABBED_OPTIONS_DESCRIPTION, | 
|   53     kOsWin | kOsLinux | kOsMac,  // Enabled by default on CrOS. |   75     kOsWin | kOsLinux | kOsMac,  // Enabled by default on CrOS. | 
|   54     switches::kEnableTabbedOptions |   76     switches::kEnableTabbedOptions | 
|   55   }, |   77   }, | 
|   56   { |   78   { | 
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  458     num_experiments = arraysize(kExperiments); |  480     num_experiments = arraysize(kExperiments); | 
|  459   } else { |  481   } else { | 
|  460     experiments = e; |  482     experiments = e; | 
|  461     num_experiments = count; |  483     num_experiments = count; | 
|  462   } |  484   } | 
|  463 } |  485 } | 
|  464  |  486  | 
|  465 }  // namespace testing |  487 }  // namespace testing | 
|  466  |  488  | 
|  467 }  // namespace about_flags |  489 }  // namespace about_flags | 
| OLD | NEW |