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

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

Issue 10831302: Download resumption - Preliminary (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed content unit tests. Created 8 years, 2 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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 }, 727 },
728 { 728 {
729 "no-discard-tabs", 729 "no-discard-tabs",
730 IDS_FLAGS_NO_DISCARD_TABS_NAME, 730 IDS_FLAGS_NO_DISCARD_TABS_NAME,
731 IDS_FLAGS_NO_DISCARD_TABS_DESCRIPTION, 731 IDS_FLAGS_NO_DISCARD_TABS_DESCRIPTION,
732 kOsCrOS, 732 kOsCrOS,
733 SINGLE_VALUE_TYPE(switches::kNoDiscardTabs) 733 SINGLE_VALUE_TYPE(switches::kNoDiscardTabs)
734 }, 734 },
735 #endif 735 #endif
736 { 736 {
737 "enable-download-restarts",
738 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME,
739 IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION,
740 kOsAll,
741 SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption)
742 },
743 {
737 "allow-nacl-socket-api", 744 "allow-nacl-socket-api",
738 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME, 745 IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME,
739 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION, 746 IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION,
740 kOsAll, 747 kOsAll,
741 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*") 748 SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")
742 }, 749 },
743 { 750 {
744 "stacked-tab-strip", 751 "stacked-tab-strip",
745 IDS_FLAGS_STACKED_TAB_STRIP_NAME, 752 IDS_FLAGS_STACKED_TAB_STRIP_NAME,
746 IDS_FLAGS_STACKED_TAB_STRIP_DESCRIPTION, 753 IDS_FLAGS_STACKED_TAB_STRIP_DESCRIPTION,
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 } 1368 }
1362 1369
1363 const Experiment* GetExperiments(size_t* count) { 1370 const Experiment* GetExperiments(size_t* count) {
1364 *count = num_experiments; 1371 *count = num_experiments;
1365 return experiments; 1372 return experiments;
1366 } 1373 }
1367 1374
1368 } // namespace testing 1375 } // namespace testing
1369 1376
1370 } // namespace about_flags 1377 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698