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

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

Issue 12508004: Enabling testing Google Now component extension (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing unnecessary workaround. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_browser_main.cc » ('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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1253 }, 1253 },
1254 #if defined(OS_ANDROID) 1254 #if defined(OS_ANDROID)
1255 { 1255 {
1256 "disable-gesture-requirement-for-media-playback", 1256 "disable-gesture-requirement-for-media-playback",
1257 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME, 1257 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME,
1258 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION, 1258 IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION,
1259 kOsAndroid, 1259 kOsAndroid,
1260 SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback) 1260 SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback)
1261 }, 1261 },
1262 #endif 1262 #endif
1263 #if defined(ENABLE_GOOGLE_NOW)
1264 {
1265 "enable-google-now",
1266 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME,
1267 IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION,
1268 kOsWin | kOsCrOS,
1269 SINGLE_VALUE_TYPE(switches::kEnableGoogleNowIntegration)
1270 },
1271 #endif
1263 }; 1272 };
1264 1273
1265 const Experiment* experiments = kExperiments; 1274 const Experiment* experiments = kExperiments;
1266 size_t num_experiments = arraysize(kExperiments); 1275 size_t num_experiments = arraysize(kExperiments);
1267 1276
1268 // Stores and encapsulates the little state that about:flags has. 1277 // Stores and encapsulates the little state that about:flags has.
1269 class FlagsState { 1278 class FlagsState {
1270 public: 1279 public:
1271 FlagsState() : needs_restart_(false) {} 1280 FlagsState() : needs_restart_(false) {}
1272 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 1281 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
1806 } 1815 }
1807 1816
1808 const Experiment* GetExperiments(size_t* count) { 1817 const Experiment* GetExperiments(size_t* count) {
1809 *count = num_experiments; 1818 *count = num_experiments;
1810 return experiments; 1819 return experiments;
1811 } 1820 }
1812 1821
1813 } // namespace testing 1822 } // namespace testing
1814 1823
1815 } // namespace about_flags 1824 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698