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

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

Issue 7878003: Enable multi-profiles on M16 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | « no previous file | chrome/browser/profiles/profile_manager.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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 "ppapi-flash-in-process", 264 "ppapi-flash-in-process",
265 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME, 265 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME,
266 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION, 266 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION,
267 kOsAll, 267 kOsAll,
268 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess) 268 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess)
269 }, 269 },
270 { 270 {
271 "multi-profiles", 271 "multi-profiles",
272 IDS_FLAGS_MULTI_PROFILES_NAME, 272 IDS_FLAGS_MULTI_PROFILES_NAME,
273 IDS_FLAGS_MULTI_PROFILES_DESCRIPTION, 273 IDS_FLAGS_MULTI_PROFILES_DESCRIPTION,
274 kOsWin | kOsMac | kOsLinux, // This switch is not available in CrOS. 274 kOsLinux, // This switch is not available in CrOS.
275 SINGLE_VALUE_TYPE(switches::kMultiProfiles) 275 SINGLE_VALUE_TYPE(switches::kMultiProfiles)
276 }, 276 },
277 { 277 {
278 "restrict-instant-to-search", 278 "restrict-instant-to-search",
279 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_NAME, 279 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_NAME,
280 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_DESCRIPTION, 280 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_DESCRIPTION,
281 kOsAll, 281 kOsAll,
282 SINGLE_VALUE_TYPE(switches::kRestrictInstantToSearch) 282 SINGLE_VALUE_TYPE(switches::kRestrictInstantToSearch)
283 }, 283 },
284 { 284 {
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
835 } 835 }
836 836
837 const Experiment* GetExperiments(size_t* count) { 837 const Experiment* GetExperiments(size_t* count) {
838 *count = num_experiments; 838 *count = num_experiments;
839 return experiments; 839 return experiments;
840 } 840 }
841 841
842 } // namespace testing 842 } // namespace testing
843 843
844 } // namespace about_flags 844 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698