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

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

Issue 4524002: First cut of the about:conflicts page, listing all DLLs loaded in the Chrome ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 switches::kEnableXSSAuditor 84 switches::kEnableXSSAuditor
85 }, 85 },
86 { 86 {
87 "background-webapps", // Do not change; see above 87 "background-webapps", // Do not change; see above
88 IDS_FLAGS_BACKGROUND_WEBAPPS_NAME, 88 IDS_FLAGS_BACKGROUND_WEBAPPS_NAME,
89 IDS_FLAGS_BACKGROUND_WEBAPPS_DESCRIPTION, 89 IDS_FLAGS_BACKGROUND_WEBAPPS_DESCRIPTION,
90 kOsAll, 90 kOsAll,
91 switches::kEnableBackgroundMode 91 switches::kEnableBackgroundMode
92 }, 92 },
93 { 93 {
94 "conflicting-modules-check", // Do not change; see above.
95 IDS_FLAGS_CONFLICTS_CHECK_NAME,
96 IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION,
97 kOsWin,
98 switches::kConflictingModulesCheck
99 },
100 {
94 "cloud-print-proxy", // Do not change; see above. 101 "cloud-print-proxy", // Do not change; see above.
95 IDS_FLAGS_CLOUD_PRINT_PROXY_NAME, 102 IDS_FLAGS_CLOUD_PRINT_PROXY_NAME,
96 IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION, 103 IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION,
97 kOsWin, 104 kOsWin,
98 switches::kEnableCloudPrintProxy 105 switches::kEnableCloudPrintProxy
99 }, 106 },
100 { 107 {
101 "match-preview", // Do not change; see above. 108 "match-preview", // Do not change; see above.
102 IDS_FLAGS_PREDICTIVE_INSTANT_NAME, 109 IDS_FLAGS_PREDICTIVE_INSTANT_NAME,
103 IDS_FLAGS_PREDICTIVE_INSTANT_DESCRIPTION, 110 IDS_FLAGS_PREDICTIVE_INSTANT_DESCRIPTION,
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 num_experiments = arraysize(kExperiments); 423 num_experiments = arraysize(kExperiments);
417 } else { 424 } else {
418 experiments = e; 425 experiments = e;
419 num_experiments = count; 426 num_experiments = count;
420 } 427 }
421 } 428 }
422 429
423 } // namespace testing 430 } // namespace testing
424 431
425 } // namespace about_flags 432 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698