| 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 1935 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1946     SINGLE_VALUE_TYPE(switches::kEnableSavePasswordBubble) | 1946     SINGLE_VALUE_TYPE(switches::kEnableSavePasswordBubble) | 
| 1947   }, | 1947   }, | 
| 1948 #endif | 1948 #endif | 
| 1949   { | 1949   { | 
| 1950     "embed-flash-fullscreen", | 1950     "embed-flash-fullscreen", | 
| 1951     IDS_FLAGS_EMBED_FLASH_FULLSCREEN_NAME, | 1951     IDS_FLAGS_EMBED_FLASH_FULLSCREEN_NAME, | 
| 1952     IDS_FLAGS_EMBED_FLASH_FULLSCREEN_DESCRIPTION, | 1952     IDS_FLAGS_EMBED_FLASH_FULLSCREEN_DESCRIPTION, | 
| 1953     kOsDesktop, | 1953     kOsDesktop, | 
| 1954     SINGLE_VALUE_TYPE(switches::kEmbedFlashFullscreen) | 1954     SINGLE_VALUE_TYPE(switches::kEmbedFlashFullscreen) | 
| 1955   }, | 1955   }, | 
| 1956 #if defined(USE_AURA) |  | 
| 1957   { |  | 
| 1958     "use-system-title-bar", |  | 
| 1959     IDS_FLAGS_USE_SYSTEM_TITLE_BAR, |  | 
| 1960     IDS_FLAGS_USE_SYSTEM_TITLE_BAR_DESCRIPTION, |  | 
| 1961     kOsLinux, |  | 
| 1962     SINGLE_VALUE_TYPE(switches::kUseSystemTitleBar) |  | 
| 1963   }, |  | 
| 1964 #endif |  | 
| 1965 #if defined(USE_AURA) || defined(OS_WIN) | 1956 #if defined(USE_AURA) || defined(OS_WIN) | 
| 1966   { | 1957   { | 
| 1967     "enable-permissions-bubbles", | 1958     "enable-permissions-bubbles", | 
| 1968     IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, | 1959     IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_NAME, | 
| 1969     IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION, | 1960     IDS_FLAGS_ENABLE_PERMISSIONS_BUBBLES_DESCRIPTION, | 
| 1970     kOsCrOS | kOsWin, | 1961     kOsCrOS | kOsWin, | 
| 1971     SINGLE_VALUE_TYPE(switches::kEnablePermissionsBubbles) | 1962     SINGLE_VALUE_TYPE(switches::kEnablePermissionsBubbles) | 
| 1972   }, | 1963   }, | 
| 1973 #endif | 1964 #endif | 
| 1974   { | 1965   { | 
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2489 } | 2480 } | 
| 2490 | 2481 | 
| 2491 const Experiment* GetExperiments(size_t* count) { | 2482 const Experiment* GetExperiments(size_t* count) { | 
| 2492   *count = num_experiments; | 2483   *count = num_experiments; | 
| 2493   return experiments; | 2484   return experiments; | 
| 2494 } | 2485 } | 
| 2495 | 2486 | 
| 2496 }  // namespace testing | 2487 }  // namespace testing | 
| 2497 | 2488 | 
| 2498 }  // namespace about_flags | 2489 }  // namespace about_flags | 
| OLD | NEW | 
|---|