Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(386)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2944973002: Remove IS_IOS checks in chrome/ (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2475 matching lines...) Expand 10 before | Expand all | Expand 10 after
2486 {"enable-cros-component", flag_descriptions::kCrOSComponentName, 2486 {"enable-cros-component", flag_descriptions::kCrOSComponentName,
2487 flag_descriptions::kCrOSComponentDescription, kOsCrOS, 2487 flag_descriptions::kCrOSComponentDescription, kOsCrOS,
2488 FEATURE_VALUE_TYPE(features::kCrOSComponent)}, 2488 FEATURE_VALUE_TYPE(features::kCrOSComponent)},
2489 {"enable-encryption-migration", 2489 {"enable-encryption-migration",
2490 flag_descriptions::kEnableEncryptionMigrationName, 2490 flag_descriptions::kEnableEncryptionMigrationName,
2491 flag_descriptions::kEnableEncryptionMigrationDescription, kOsCrOS, 2491 flag_descriptions::kEnableEncryptionMigrationDescription, kOsCrOS,
2492 ENABLE_DISABLE_VALUE_TYPE( 2492 ENABLE_DISABLE_VALUE_TYPE(
2493 chromeos::switches::kEnableEncryptionMigration, 2493 chromeos::switches::kEnableEncryptionMigration,
2494 chromeos::switches::kDisableEncryptionMigration)}, 2494 chromeos::switches::kDisableEncryptionMigration)},
2495 #endif // OS_CHROMEOS 2495 #endif // OS_CHROMEOS
2496 #if !defined(OS_ANDROID) && !defined(OS_IOS) && defined(GOOGLE_CHROME_BUILD) 2496 #if !defined(OS_ANDROID) && defined(GOOGLE_CHROME_BUILD)
2497 {"enable-google-branded-context-menu", 2497 {"enable-google-branded-context-menu",
2498 flag_descriptions::kGoogleBrandedContextMenuName, 2498 flag_descriptions::kGoogleBrandedContextMenuName,
2499 flag_descriptions::kGoogleBrandedContextMenuDescription, kOsDesktop, 2499 flag_descriptions::kGoogleBrandedContextMenuDescription, kOsDesktop,
2500 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)}, 2500 SINGLE_VALUE_TYPE(switches::kEnableGoogleBrandedContextMenu)},
2501 #endif // !OS_ANDROID && !OS_IOS && GOOGLE_CHROME_BUILD 2501 #endif // !OS_ANDROID && GOOGLE_CHROME_BUILD
2502 #if defined(OS_MACOSX) 2502 #if defined(OS_MACOSX)
2503 {"enable-fullscreen-in-tab-detaching", 2503 {"enable-fullscreen-in-tab-detaching",
2504 flag_descriptions::kTabDetachingInFullscreenName, 2504 flag_descriptions::kTabDetachingInFullscreenName,
2505 flag_descriptions::kTabDetachingInFullscreenDescription, kOsMac, 2505 flag_descriptions::kTabDetachingInFullscreenDescription, kOsMac,
2506 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching, 2506 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableFullscreenTabDetaching,
2507 switches::kDisableFullscreenTabDetaching)}, 2507 switches::kDisableFullscreenTabDetaching)},
2508 {"enable-fullscreen-toolbar-reveal", 2508 {"enable-fullscreen-toolbar-reveal",
2509 flag_descriptions::kFullscreenToolbarRevealName, 2509 flag_descriptions::kFullscreenToolbarRevealName,
2510 flag_descriptions::kFullscreenToolbarRevealDescription, kOsMac, 2510 flag_descriptions::kFullscreenToolbarRevealDescription, kOsMac,
2511 SINGLE_VALUE_TYPE(switches::kEnableFullscreenToolbarReveal)}, 2511 SINGLE_VALUE_TYPE(switches::kEnableFullscreenToolbarReveal)},
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
2681 flag_descriptions::kWebPaymentsModifiersDescription, kOsAndroid, 2681 flag_descriptions::kWebPaymentsModifiersDescription, kOsAndroid,
2682 FEATURE_VALUE_TYPE(chrome::android::kWebPaymentsModifiers)}, 2682 FEATURE_VALUE_TYPE(chrome::android::kWebPaymentsModifiers)},
2683 {"xgeo-visible-networks", flag_descriptions::kXGEOVisibleNetworksName, 2683 {"xgeo-visible-networks", flag_descriptions::kXGEOVisibleNetworksName,
2684 flag_descriptions::kXGEOVisibleNetworksDescription, kOsAndroid, 2684 flag_descriptions::kXGEOVisibleNetworksDescription, kOsAndroid,
2685 FEATURE_VALUE_TYPE(chrome::android::kXGEOVisibleNetworks)}, 2685 FEATURE_VALUE_TYPE(chrome::android::kXGEOVisibleNetworks)},
2686 #endif // !defined(OS_ANDROID) 2686 #endif // !defined(OS_ANDROID)
2687 {"cross-process-guests", 2687 {"cross-process-guests",
2688 flag_descriptions::kCrossProcessGuestViewIsolationName, 2688 flag_descriptions::kCrossProcessGuestViewIsolationName,
2689 flag_descriptions::kCrossProcessGuestViewIsolationDescription, kOsDesktop, 2689 flag_descriptions::kCrossProcessGuestViewIsolationDescription, kOsDesktop,
2690 FEATURE_VALUE_TYPE(features::kGuestViewCrossProcessFrames)}, 2690 FEATURE_VALUE_TYPE(features::kGuestViewCrossProcessFrames)},
2691 #if !defined(OS_ANDROID) && !defined(OS_IOS) 2691 #if !defined(OS_ANDROID)
2692 {"media-remoting", flag_descriptions::kMediaRemotingName, 2692 {"media-remoting", flag_descriptions::kMediaRemotingName,
2693 flag_descriptions::kMediaRemotingDescription, kOsDesktop, 2693 flag_descriptions::kMediaRemotingDescription, kOsDesktop,
2694 FEATURE_VALUE_TYPE(features::kMediaRemoting)}, 2694 FEATURE_VALUE_TYPE(features::kMediaRemoting)},
2695 #endif 2695 #endif
2696 #if defined(OS_ANDROID) 2696 #if defined(OS_ANDROID)
2697 {"video-fullscreen-orientation-lock", 2697 {"video-fullscreen-orientation-lock",
2698 flag_descriptions::kVideoFullscreenOrientationLockName, 2698 flag_descriptions::kVideoFullscreenOrientationLockName,
2699 flag_descriptions::kVideoFullscreenOrientationLockDescription, kOsAndroid, 2699 flag_descriptions::kVideoFullscreenOrientationLockDescription, kOsAndroid,
2700 FEATURE_VALUE_TYPE(media::kVideoFullscreenOrientationLock)}, 2700 FEATURE_VALUE_TYPE(media::kVideoFullscreenOrientationLock)},
2701 {"video-rotate-to-fullscreen", 2701 {"video-rotate-to-fullscreen",
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
2974 2974
2975 {"force-effective-connection-type", 2975 {"force-effective-connection-type",
2976 flag_descriptions::kForceEffectiveConnectionTypeName, 2976 flag_descriptions::kForceEffectiveConnectionTypeName,
2977 flag_descriptions::kForceEffectiveConnectionTypeDescription, kOsAll, 2977 flag_descriptions::kForceEffectiveConnectionTypeDescription, kOsAll,
2978 MULTI_VALUE_TYPE(kForceEffectiveConnectionTypeChoices)}, 2978 MULTI_VALUE_TYPE(kForceEffectiveConnectionTypeChoices)},
2979 2979
2980 {"enable-heap-profiling", flag_descriptions::kEnableHeapProfilingName, 2980 {"enable-heap-profiling", flag_descriptions::kEnableHeapProfilingName,
2981 flag_descriptions::kEnableHeapProfilingDescription, kOsAll, 2981 flag_descriptions::kEnableHeapProfilingDescription, kOsAll,
2982 MULTI_VALUE_TYPE(kEnableHeapProfilingChoices)}, 2982 MULTI_VALUE_TYPE(kEnableHeapProfilingChoices)},
2983 2983
2984 #if defined(TOOLKIT_VIEWS) || (defined(OS_MACOSX) && !defined(OS_IOS)) 2984 #if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
2985 {"show-cert-link", flag_descriptions::kShowCertLinkOnPageInfoName, 2985 {"show-cert-link", flag_descriptions::kShowCertLinkOnPageInfoName,
2986 flag_descriptions::kShowCertLinkOnPageInfoDescription, kOsDesktop, 2986 flag_descriptions::kShowCertLinkOnPageInfoDescription, kOsDesktop,
2987 SINGLE_VALUE_TYPE(switches::kShowCertLink)}, 2987 SINGLE_VALUE_TYPE(switches::kShowCertLink)},
2988 #endif 2988 #endif
2989 2989
2990 {"omnibox-ui-hide-suggestion-url-path", 2990 {"omnibox-ui-hide-suggestion-url-path",
2991 flag_descriptions::kOmniboxUIHideSuggestionUrlPathName, 2991 flag_descriptions::kOmniboxUIHideSuggestionUrlPathName,
2992 flag_descriptions::kOmniboxUIHideSuggestionUrlPathDescription, kOsDesktop, 2992 flag_descriptions::kOmniboxUIHideSuggestionUrlPathDescription, kOsDesktop,
2993 FEATURE_VALUE_TYPE(omnibox::kUIExperimentHideSuggestionUrlPath)}, 2993 FEATURE_VALUE_TYPE(omnibox::kUIExperimentHideSuggestionUrlPath)},
2994 2994
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
3043 flag_descriptions::kCaptureThumbnailOnLoadFinishedName, 3043 flag_descriptions::kCaptureThumbnailOnLoadFinishedName,
3044 flag_descriptions::kCaptureThumbnailOnLoadFinishedDescription, kOsDesktop, 3044 flag_descriptions::kCaptureThumbnailOnLoadFinishedDescription, kOsDesktop,
3045 FEATURE_VALUE_TYPE(features::kCaptureThumbnailOnLoadFinished)}, 3045 FEATURE_VALUE_TYPE(features::kCaptureThumbnailOnLoadFinished)},
3046 3046
3047 #if defined(OS_WIN) 3047 #if defined(OS_WIN)
3048 {"enable-d3d-vsync", flag_descriptions::kEnableD3DVsync, 3048 {"enable-d3d-vsync", flag_descriptions::kEnableD3DVsync,
3049 flag_descriptions::kEnableD3DVsyncDescription, kOsWin, 3049 flag_descriptions::kEnableD3DVsyncDescription, kOsWin,
3050 FEATURE_VALUE_TYPE(features::kD3DVsync)}, 3050 FEATURE_VALUE_TYPE(features::kD3DVsync)},
3051 #endif // defined(OS_WIN) 3051 #endif // defined(OS_WIN)
3052 3052
3053 #if !defined(OS_ANDROID) && !defined(OS_IOS) 3053 #if !defined(OS_ANDROID)
3054 {"use-google-local-ntp", flag_descriptions::kUseGoogleLocalNtpName, 3054 {"use-google-local-ntp", flag_descriptions::kUseGoogleLocalNtpName,
3055 flag_descriptions::kUseGoogleLocalNtpDescription, kOsDesktop, 3055 flag_descriptions::kUseGoogleLocalNtpDescription, kOsDesktop,
3056 FEATURE_VALUE_TYPE(features::kUseGoogleLocalNtp)}, 3056 FEATURE_VALUE_TYPE(features::kUseGoogleLocalNtp)},
3057 3057
3058 {"one-google-bar-on-local-ntp", 3058 {"one-google-bar-on-local-ntp",
3059 flag_descriptions::kOneGoogleBarOnLocalNtpName, 3059 flag_descriptions::kOneGoogleBarOnLocalNtpName,
3060 flag_descriptions::kOneGoogleBarOnLocalNtpDescription, kOsDesktop, 3060 flag_descriptions::kOneGoogleBarOnLocalNtpDescription, kOsDesktop,
3061 FEATURE_VALUE_TYPE(features::kOneGoogleBarOnLocalNtp)}, 3061 FEATURE_VALUE_TYPE(features::kOneGoogleBarOnLocalNtp)},
3062 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) 3062 #endif // !defined(OS_ANDROID)
3063 3063
3064 #if defined(OS_MACOSX) 3064 #if defined(OS_MACOSX)
3065 {"mac-rtl", flag_descriptions::kMacRTLName, 3065 {"mac-rtl", flag_descriptions::kMacRTLName,
3066 flag_descriptions::kMacRTLDescription, kOsMac, 3066 flag_descriptions::kMacRTLDescription, kOsMac,
3067 FEATURE_VALUE_TYPE(features::kMacRTL)}, 3067 FEATURE_VALUE_TYPE(features::kMacRTL)},
3068 #endif // defined(OS_MACOSX) 3068 #endif // defined(OS_MACOSX)
3069 3069
3070 #if defined(OS_CHROMEOS) 3070 #if defined(OS_CHROMEOS)
3071 {"disable-new-virtual-keyboard-behavior", 3071 {"disable-new-virtual-keyboard-behavior",
3072 flag_descriptions::kDisableNewVirtualKeyboardBehaviorName, 3072 flag_descriptions::kDisableNewVirtualKeyboardBehaviorName,
3073 flag_descriptions::kDisableNewVirtualKeyboardBehaviorDescription, kOsCrOS, 3073 flag_descriptions::kDisableNewVirtualKeyboardBehaviorDescription, kOsCrOS,
3074 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewVirtualKeyboardBehavior)}, 3074 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewVirtualKeyboardBehavior)},
3075 #endif // defined(OS_CHROMEOS) 3075 #endif // defined(OS_CHROMEOS)
3076 3076
3077 #if !defined(OS_ANDROID) && !defined(OS_IOS) 3077 #if !defined(OS_ANDROID)
3078 {"enable-picture-in-picture", 3078 {"enable-picture-in-picture",
3079 flag_descriptions::kEnablePictureInPictureName, 3079 flag_descriptions::kEnablePictureInPictureName,
3080 flag_descriptions::kEnablePictureInPictureDescription, kOsDesktop, 3080 flag_descriptions::kEnablePictureInPictureDescription, kOsDesktop,
3081 SINGLE_VALUE_TYPE(switches::kEnablePictureInPicture)}, 3081 SINGLE_VALUE_TYPE(switches::kEnablePictureInPicture)},
3082 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) 3082 #endif // !defined(OS_ANDROID)
3083 {"browser-side-navigation", flag_descriptions::kBrowserSideNavigationName, 3083 {"browser-side-navigation", flag_descriptions::kBrowserSideNavigationName,
3084 flag_descriptions::kBrowserSideNavigationDescription, kOsAll, 3084 flag_descriptions::kBrowserSideNavigationDescription, kOsAll,
3085 FEATURE_VALUE_TYPE(features::kBrowserSideNavigation)}, 3085 FEATURE_VALUE_TYPE(features::kBrowserSideNavigation)},
3086 3086
3087 #if defined(OS_MACOSX) 3087 #if defined(OS_MACOSX)
3088 {"mac-touchbar", flag_descriptions::kMacTouchBarName, 3088 {"mac-touchbar", flag_descriptions::kMacTouchBarName,
3089 flag_descriptions::kMacTouchBarDescription, kOsMac, 3089 flag_descriptions::kMacTouchBarDescription, kOsMac,
3090 FEATURE_VALUE_TYPE(features::kBrowserTouchBar)}, 3090 FEATURE_VALUE_TYPE(features::kBrowserTouchBar)},
3091 #endif // defined(OS_MACOSX) 3091 #endif // defined(OS_MACOSX)
3092 3092
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
3312 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3312 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3313 3313
3314 const FeatureEntry* GetFeatureEntries(size_t* count) { 3314 const FeatureEntry* GetFeatureEntries(size_t* count) {
3315 *count = arraysize(kFeatureEntries); 3315 *count = arraysize(kFeatureEntries);
3316 return kFeatureEntries; 3316 return kFeatureEntries;
3317 } 3317 }
3318 3318
3319 } // namespace testing 3319 } // namespace testing
3320 3320
3321 } // namespace about_flags 3321 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698