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

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

Issue 8771048: Add back pipelining after M17 branch point. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix merge, match order with GRD file. Created 9 years 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 | « no previous file | 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) 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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 kOsMac | kOsWin | kOsLinux, 365 kOsMac | kOsWin | kOsLinux,
366 SINGLE_VALUE_TYPE(switches::kEnableAutologin) 366 SINGLE_VALUE_TYPE(switches::kEnableAutologin)
367 }, 367 },
368 { 368 {
369 "use-more-webui", 369 "use-more-webui",
370 IDS_FLAGS_USE_MORE_WEBUI_NAME, 370 IDS_FLAGS_USE_MORE_WEBUI_NAME,
371 IDS_FLAGS_USE_MORE_WEBUI_DESCRIPTION, 371 IDS_FLAGS_USE_MORE_WEBUI_DESCRIPTION,
372 kOsAll, 372 kOsAll,
373 SINGLE_VALUE_TYPE(switches::kUseMoreWebUI) 373 SINGLE_VALUE_TYPE(switches::kUseMoreWebUI)
374 }, 374 },
375 {
376 "enable-http-pipelining",
377 IDS_FLAGS_ENABLE_HTTP_PIPELINING_NAME,
378 IDS_FLAGS_ENABLE_HTTP_PIPELINING_DESCRIPTION,
379 kOsAll,
380 SINGLE_VALUE_TYPE(switches::kEnableHttpPipelining)
381 },
375 // TODO(flackr): Remove this flag and views screen locker when the WebUI 382 // TODO(flackr): Remove this flag and views screen locker when the WebUI
376 // locker is mature (crbug.com/105263). 383 // locker is mature (crbug.com/105263).
377 { 384 {
378 "disable-webui-lock-screen", 385 "disable-webui-lock-screen",
379 IDS_FLAGS_WEBUI_LOCK_NAME, 386 IDS_FLAGS_WEBUI_LOCK_NAME,
380 IDS_FLAGS_WEBUI_LOCK_DESCRIPTION, 387 IDS_FLAGS_WEBUI_LOCK_DESCRIPTION,
381 kOsCrOS, 388 kOsCrOS,
382 #if defined(OS_CHROMEOS) 389 #if defined(OS_CHROMEOS)
383 SINGLE_VALUE_TYPE(switches::kDisableWebUILockScreen) 390 SINGLE_VALUE_TYPE(switches::kDisableWebUILockScreen)
384 #else 391 #else
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 } 858 }
852 859
853 const Experiment* GetExperiments(size_t* count) { 860 const Experiment* GetExperiments(size_t* count) {
854 *count = num_experiments; 861 *count = num_experiments;
855 return experiments; 862 return experiments;
856 } 863 }
857 864
858 } // namespace testing 865 } // namespace testing
859 866
860 } // namespace about_flags 867 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698