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

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

Issue 10213008: Add platform apps switch to chrome://flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 8 years, 8 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 | no next file » | 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) 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 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 SINGLE_VALUE_TYPE(switches::kNoDiscardTabs) 643 SINGLE_VALUE_TYPE(switches::kNoDiscardTabs)
644 }, 644 },
645 #endif 645 #endif
646 { 646 {
647 "enable-sync-signin", 647 "enable-sync-signin",
648 IDS_ENABLE_SYNC_SIGNIN_NAME, 648 IDS_ENABLE_SYNC_SIGNIN_NAME,
649 IDS_ENABLE_SYNC_SIGNIN_DESCRIPTION, 649 IDS_ENABLE_SYNC_SIGNIN_DESCRIPTION,
650 kOsAll, 650 kOsAll,
651 SINGLE_VALUE_TYPE(switches::kEnableSyncSignin) 651 SINGLE_VALUE_TYPE(switches::kEnableSyncSignin)
652 }, 652 },
653 {
654 "enable-platform-apps",
655 IDS_FLAGS_ENABLE_PLATFORM_APPS_NAME,
656 IDS_FLAGS_ENABLE_PLATFORM_APPS_DESCRIPTION,
657 kOsAll,
658 SINGLE_VALUE_TYPE(switches::kEnablePlatformApps)
659 }
653 }; 660 };
654 661
655 const Experiment* experiments = kExperiments; 662 const Experiment* experiments = kExperiments;
656 size_t num_experiments = arraysize(kExperiments); 663 size_t num_experiments = arraysize(kExperiments);
657 664
658 // Stores and encapsulates the little state that about:flags has. 665 // Stores and encapsulates the little state that about:flags has.
659 class FlagsState { 666 class FlagsState {
660 public: 667 public:
661 FlagsState() : needs_restart_(false) {} 668 FlagsState() : needs_restart_(false) {}
662 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 669 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 } 1085 }
1079 1086
1080 const Experiment* GetExperiments(size_t* count) { 1087 const Experiment* GetExperiments(size_t* count) {
1081 *count = num_experiments; 1088 *count = num_experiments;
1082 return experiments; 1089 return experiments;
1083 } 1090 }
1084 1091
1085 } // namespace testing 1092 } // namespace testing
1086 1093
1087 } // namespace about_flags 1094 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698