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

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

Issue 6961007: WebSocket over SPDY. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebased Created 9 years, 5 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') | net/websockets/websocket_job.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) 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 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 #endif 376 #endif
377 SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling) 377 SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling)
378 }, 378 },
379 { 379 {
380 "prerender-from-omnibox", 380 "prerender-from-omnibox",
381 IDS_FLAGS_PRERENDER_FROM_OMNIBOX_NAME, 381 IDS_FLAGS_PRERENDER_FROM_OMNIBOX_NAME,
382 IDS_FLAGS_PRERENDER_FROM_OMNIBOX_DESCRIPTION, 382 IDS_FLAGS_PRERENDER_FROM_OMNIBOX_DESCRIPTION,
383 kOsAll, 383 kOsAll,
384 SINGLE_VALUE_TYPE(switches::kPrerenderFromOmnibox) 384 SINGLE_VALUE_TYPE(switches::kPrerenderFromOmnibox)
385 }, 385 },
386 {
387 "websocket-over-spdy",
388 IDS_FLAGS_WEBSOCKET_OVER_SPDY_NAME,
389 IDS_FLAGS_WEBSOCKET_OVER_SPDY_DESCRIPTION,
390 kOsAll,
391 SINGLE_VALUE_TYPE(switches::kEnableWebSocketOverSpdy)
392 },
386 }; 393 };
387 394
388 const Experiment* experiments = kExperiments; 395 const Experiment* experiments = kExperiments;
389 size_t num_experiments = arraysize(kExperiments); 396 size_t num_experiments = arraysize(kExperiments);
390 397
391 // Stores and encapsulates the little state that about:flags has. 398 // Stores and encapsulates the little state that about:flags has.
392 class FlagsState { 399 class FlagsState {
393 public: 400 public:
394 FlagsState() : needs_restart_(false) {} 401 FlagsState() : needs_restart_(false) {}
395 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 402 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 } 823 }
817 824
818 const Experiment* GetExperiments(size_t* count) { 825 const Experiment* GetExperiments(size_t* count) {
819 *count = num_experiments; 826 *count = num_experiments;
820 return experiments; 827 return experiments;
821 } 828 }
822 829
823 } // namespace testing 830 } // namespace testing
824 831
825 } // namespace about_flags 832 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | net/websockets/websocket_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698