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

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

Issue 10539038: Reland 140878 - cleanup: Remove applist v1 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix borken AppInstallConfirmation* browser_tests Created 8 years, 6 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/app_list/DEPS » ('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 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 #endif 702 #endif
703 { 703 {
704 "disable-client-oauth-signin", 704 "disable-client-oauth-signin",
705 IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_NAME, 705 IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_NAME,
706 IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION, 706 IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION,
707 kOsMac | kOsWin | kOsLinux, 707 kOsMac | kOsWin | kOsLinux,
708 SINGLE_VALUE_TYPE(switches::kDisableClientOAuthSignin) 708 SINGLE_VALUE_TYPE(switches::kDisableClientOAuthSignin)
709 }, 709 },
710 #if defined(USE_ASH) 710 #if defined(USE_ASH)
711 { 711 {
712 "enable-applist-v2",
713 IDS_FLAGS_ENABLE_APPLIST_V2_NAME,
714 IDS_FLAGS_ENABLE_APPLIST_V2_DESCRIPTION,
715 kOsAll,
716 SINGLE_VALUE_TYPE(ash::switches::kEnableAppListV2),
717 },
718 {
719 "show-launcher-alignment-menu", 712 "show-launcher-alignment-menu",
720 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME, 713 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME,
721 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION, 714 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION,
722 kOsAll, 715 kOsAll,
723 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu) 716 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu)
724 }, 717 },
725 { 718 {
726 "show-touch-hud", 719 "show-touch-hud",
727 IDS_FLAGS_SHOW_TOUCH_HUD_NAME, 720 IDS_FLAGS_SHOW_TOUCH_HUD_NAME,
728 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION, 721 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION,
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 } 1181 }
1189 1182
1190 const Experiment* GetExperiments(size_t* count) { 1183 const Experiment* GetExperiments(size_t* count) {
1191 *count = num_experiments; 1184 *count = num_experiments;
1192 return experiments; 1185 return experiments;
1193 } 1186 }
1194 1187
1195 } // namespace testing 1188 } // namespace testing
1196 1189
1197 } // namespace about_flags 1190 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | ui/app_list/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698