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

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

Issue 2737393002: Implement the new Photo picker, part one. (Closed)
Patch Set: Address comments Created 3 years, 9 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
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 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll, 803 IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION, kOsAll,
804 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)}, 804 SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
805 {"WebRtcUseEchoCanceller3", IDS_FLAGS_WEBRTC_ECHO_CANCELLER_3_NAME, 805 {"WebRtcUseEchoCanceller3", IDS_FLAGS_WEBRTC_ECHO_CANCELLER_3_NAME,
806 IDS_FLAGS_WEBRTC_ECHO_CANCELLER_3_DESCRIPTION, kOsAll, 806 IDS_FLAGS_WEBRTC_ECHO_CANCELLER_3_DESCRIPTION, kOsAll,
807 FEATURE_VALUE_TYPE(features::kWebRtcUseEchoCanceller3)}, 807 FEATURE_VALUE_TYPE(features::kWebRtcUseEchoCanceller3)},
808 #endif // ENABLE_WEBRTC 808 #endif // ENABLE_WEBRTC
809 #if defined(OS_ANDROID) 809 #if defined(OS_ANDROID)
810 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME, 810 {"enable-osk-overscroll", IDS_FLAGS_ENABLE_OSK_OVERSCROLL_NAME,
811 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid, 811 IDS_FLAGS_ENABLE_OSK_OVERSCROLL_DESCRIPTION, kOsAndroid,
812 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)}, 812 SINGLE_VALUE_TYPE(switches::kEnableOSKOverscroll)},
813 {"enable-new-photo-picker", IDS_FLAGS_NEW_PHOTO_PICKER_NAME,
814 IDS_FLAGS_NEW_PHOTO_PICKER_DESCRIPTION, kOsAndroid,
815 FEATURE_VALUE_TYPE(chrome::android::kEnableNewPhotoPicker)},
Michael van Ouwerkerk 2017/03/14 15:57:27 just kNewPhotoPicker seems cleaner
Finnur 2017/03/15 13:25:06 ../../chrome/browser/about_flags.cc:815:25: error:
Michael van Ouwerkerk 2017/03/15 13:28:38 What I meant was that none of the other features i
Finnur 2017/03/15 14:45:40 Ah, right! Done. Thanks for the review, Michael!
813 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME, 816 {"enable-usermedia-screen-capturing", IDS_FLAGS_MEDIA_SCREEN_CAPTURE_NAME,
814 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid, 817 IDS_FLAGS_MEDIA_SCREEN_CAPTURE_DESCRIPTION, kOsAndroid,
815 FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)}, 818 FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)},
816 #endif // OS_ANDROID 819 #endif // OS_ANDROID
817 // Native client is compiled out when DISABLE_NACL is defined. 820 // Native client is compiled out when DISABLE_NACL is defined.
818 #if !defined(DISABLE_NACL) 821 #if !defined(DISABLE_NACL)
819 {"enable-nacl", IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll, 822 {"enable-nacl", IDS_FLAGS_NACL_NAME, IDS_FLAGS_NACL_DESCRIPTION, kOsAll,
820 SINGLE_VALUE_TYPE(switches::kEnableNaCl)}, 823 SINGLE_VALUE_TYPE(switches::kEnableNaCl)},
821 {"enable-nacl-debug", IDS_FLAGS_NACL_DEBUG_NAME, 824 {"enable-nacl-debug", IDS_FLAGS_NACL_DEBUG_NAME,
822 IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop, 825 IDS_FLAGS_NACL_DEBUG_DESCRIPTION, kOsDesktop,
(...skipping 1727 matching lines...) Expand 10 before | Expand all | Expand 10 after
2550 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2553 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2551 2554
2552 const FeatureEntry* GetFeatureEntries(size_t* count) { 2555 const FeatureEntry* GetFeatureEntries(size_t* count) {
2553 *count = arraysize(kFeatureEntries); 2556 *count = arraysize(kFeatureEntries);
2554 return kFeatureEntries; 2557 return kFeatureEntries;
2555 } 2558 }
2556 2559
2557 } // namespace testing 2560 } // namespace testing
2558 2561
2559 } // namespace about_flags 2562 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698