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

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

Issue 2694893002: Integrate SMS service with Desktop iOS promotion (Closed)
Patch Set: unique_ptr Created 3 years, 10 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 2237 matching lines...) Expand 10 before | Expand all | Expand 10 after
2248 2248
2249 {"enable-midi-manager-dynamic-instantiation", 2249 {"enable-midi-manager-dynamic-instantiation",
2250 IDS_FLAGS_ENABLE_MIDI_MANAGER_DYNAMIC_INSTANTIATION_NAME, 2250 IDS_FLAGS_ENABLE_MIDI_MANAGER_DYNAMIC_INSTANTIATION_NAME,
2251 IDS_FLAGS_ENABLE_MIDI_MANAGER_DYNAMIC_INSTANTIATION_DESCRIPTION, kOsAll, 2251 IDS_FLAGS_ENABLE_MIDI_MANAGER_DYNAMIC_INSTANTIATION_DESCRIPTION, kOsAll,
2252 FEATURE_VALUE_TYPE(midi::features::kMidiManagerDynamicInstantiation)}, 2252 FEATURE_VALUE_TYPE(midi::features::kMidiManagerDynamicInstantiation)},
2253 2253
2254 #if defined(OS_WIN) 2254 #if defined(OS_WIN)
2255 {"new-usb-backend", IDS_FLAGS_NEW_USB_BACKEND_NAME, 2255 {"new-usb-backend", IDS_FLAGS_NEW_USB_BACKEND_NAME,
2256 IDS_FLAGS_NEW_USB_BACKEND_DESCRIPTION, kOsWin, 2256 IDS_FLAGS_NEW_USB_BACKEND_DESCRIPTION, kOsWin,
2257 FEATURE_VALUE_TYPE(device::kNewUsbBackend)}, 2257 FEATURE_VALUE_TYPE(device::kNewUsbBackend)},
2258 {"enable-desktop-ios-promotions",
2259 IDS_FLAGS_ENABLE_DESKTOP_IOS_PROMOTIONS_NAME,
2260 IDS_FLAGS_ENABLE_DESKTOP_IOS_PROMOTIONS_DESCRIPTION, kOsWin,
2261 FEATURE_VALUE_TYPE(features::kDesktopIOSPromotion)},
2258 #endif // defined(OS_WIN) 2262 #endif // defined(OS_WIN)
2259 2263
2260 #if defined(OS_CHROMEOS) 2264 #if defined(OS_CHROMEOS)
2261 {"enable-touch-support-for-screen-magnifier", 2265 {"enable-touch-support-for-screen-magnifier",
2262 IDS_FLAGS_ENABLE_TOUCH_SUPPORT_FOR_SCREEN_MAGNIFIER_NAME, 2266 IDS_FLAGS_ENABLE_TOUCH_SUPPORT_FOR_SCREEN_MAGNIFIER_NAME,
2263 IDS_FLAGS_ENABLE_TOUCH_SUPPORT_FOR_SCREEN_MAGNIFIER_DESCRIPTION, kOsCrOS, 2267 IDS_FLAGS_ENABLE_TOUCH_SUPPORT_FOR_SCREEN_MAGNIFIER_DESCRIPTION, kOsCrOS,
2264 SINGLE_VALUE_TYPE( 2268 SINGLE_VALUE_TYPE(
2265 chromeos::switches::kEnableTouchSupportForScreenMagnifier)}, 2269 chromeos::switches::kEnableTouchSupportForScreenMagnifier)},
2266 #endif // OS_CHROMEOS 2270 #endif // OS_CHROMEOS
2267 2271
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
2466 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2470 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2467 2471
2468 const FeatureEntry* GetFeatureEntries(size_t* count) { 2472 const FeatureEntry* GetFeatureEntries(size_t* count) {
2469 *count = arraysize(kFeatureEntries); 2473 *count = arraysize(kFeatureEntries);
2470 return kFeatureEntries; 2474 return kFeatureEntries;
2471 } 2475 }
2472 2476
2473 } // namespace testing 2477 } // namespace testing
2474 2478
2475 } // namespace about_flags 2479 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698