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

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

Issue 7210020: Added prerendering to omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error. Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 IDS_FLAGS_STATIC_IP_CONFIG_NAME, 329 IDS_FLAGS_STATIC_IP_CONFIG_NAME,
330 IDS_FLAGS_STATIC_IP_CONFIG_DESCRIPTION, 330 IDS_FLAGS_STATIC_IP_CONFIG_DESCRIPTION,
331 kOsCrOS, 331 kOsCrOS,
332 #if defined(OS_CHROMEOS) 332 #if defined(OS_CHROMEOS)
333 // This switch exists only on Chrome OS. 333 // This switch exists only on Chrome OS.
334 SINGLE_VALUE_TYPE(switches::kEnableStaticIPConfig) 334 SINGLE_VALUE_TYPE(switches::kEnableStaticIPConfig)
335 #else 335 #else
336 SINGLE_VALUE_TYPE("") 336 SINGLE_VALUE_TYPE("")
337 #endif 337 #endif
338 }, 338 },
339 {
340 "prerender-from-omnibox",
341 IDS_FLAGS_PRERENDER_FROM_OMNIBOX_NAME,
342 IDS_FLAGS_PRERENDER_FROM_OMNIBOX_DESCRIPTION,
343 kOsAll,
344 SINGLE_VALUE_TYPE(switches::kPrerenderFromOmnibox)
345 },
339 }; 346 };
340 347
341 const Experiment* experiments = kExperiments; 348 const Experiment* experiments = kExperiments;
342 size_t num_experiments = arraysize(kExperiments); 349 size_t num_experiments = arraysize(kExperiments);
343 350
344 // Stores and encapsulates the little state that about:flags has. 351 // Stores and encapsulates the little state that about:flags has.
345 class FlagsState { 352 class FlagsState {
346 public: 353 public:
347 FlagsState() : needs_restart_(false) {} 354 FlagsState() : needs_restart_(false) {}
348 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 355 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 } 776 }
770 777
771 const Experiment* GetExperiments(size_t* count) { 778 const Experiment* GetExperiments(size_t* count) {
772 *count = num_experiments; 779 *count = num_experiments;
773 return experiments; 780 return experiments;
774 } 781 }
775 782
776 } // namespace testing 783 } // namespace testing
777 784
778 } // namespace about_flags 785 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698