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

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

Issue 10381018: ash: First pass of Applist v2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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 | « chrome/app/generated_resources.grd ('k') | ui/views/bubble/bubble_border.h » ('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) 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 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 SINGLE_VALUE_TYPE(switches::kEnableTouchpadThreeFingerClick) 691 SINGLE_VALUE_TYPE(switches::kEnableTouchpadThreeFingerClick)
692 }, 692 },
693 #endif 693 #endif
694 { 694 {
695 "enable-client-oauth-signin", 695 "enable-client-oauth-signin",
696 IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_NAME, 696 IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_NAME,
697 IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION, 697 IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION,
698 kOsMac | kOsWin | kOsLinux, 698 kOsMac | kOsWin | kOsLinux,
699 SINGLE_VALUE_TYPE(switches::kEnableClientOAuthSignin) 699 SINGLE_VALUE_TYPE(switches::kEnableClientOAuthSignin)
700 }, 700 },
701 #if defined(USE_ASH)
702 {
703 "enable-applist-v2",
704 IDS_FLAGS_ENABLE_APPLIST_V2_NAME,
705 IDS_FLAGS_ENABLE_APPLIST_V2_DESCRIPTION,
706 kOsAll,
707 SINGLE_VALUE_TYPE(ash::switches::kEnableAppListV2),
708 },
709 #endif
701 }; 710 };
702 711
703 const Experiment* experiments = kExperiments; 712 const Experiment* experiments = kExperiments;
704 size_t num_experiments = arraysize(kExperiments); 713 size_t num_experiments = arraysize(kExperiments);
705 714
706 // Stores and encapsulates the little state that about:flags has. 715 // Stores and encapsulates the little state that about:flags has.
707 class FlagsState { 716 class FlagsState {
708 public: 717 public:
709 FlagsState() : needs_restart_(false) {} 718 FlagsState() : needs_restart_(false) {}
710 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 719 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1126 } 1135 }
1127 1136
1128 const Experiment* GetExperiments(size_t* count) { 1137 const Experiment* GetExperiments(size_t* count) {
1129 *count = num_experiments; 1138 *count = num_experiments;
1130 return experiments; 1139 return experiments;
1131 } 1140 }
1132 1141
1133 } // namespace testing 1142 } // namespace testing
1134 1143
1135 } // namespace about_flags 1144 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | ui/views/bubble/bubble_border.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698