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

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

Issue 10386178: ash: Add a heads-up display to track touch-point states and positions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang/win-aura 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') | chrome/browser/chromeos/login/login_utils.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) 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 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 SINGLE_VALUE_TYPE(ash::switches::kEnableAppListV2), 718 SINGLE_VALUE_TYPE(ash::switches::kEnableAppListV2),
719 }, 719 },
720 { 720 {
721 "show-launcher-alignment-menu", 721 "show-launcher-alignment-menu",
722 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME, 722 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME,
723 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION, 723 IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION,
724 kOsAll, 724 kOsAll,
725 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu) 725 SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu)
726 }, 726 },
727 { 727 {
728 "show-touch-hud",
729 IDS_FLAGS_SHOW_TOUCH_HUD_NAME,
730 IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION,
731 kOsAll,
732 SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)
733 },
734 {
728 "ash-notify", 735 "ash-notify",
729 IDS_FLAGS_ENABLE_ASH_NOTIFY_NAME, 736 IDS_FLAGS_ENABLE_ASH_NOTIFY_NAME,
730 IDS_FLAGS_ENABLE_ASH_NOTIFY_DESCRIPTION, 737 IDS_FLAGS_ENABLE_ASH_NOTIFY_DESCRIPTION,
731 kOsAll, 738 kOsAll,
732 SINGLE_VALUE_TYPE(ash::switches::kAshNotify), 739 SINGLE_VALUE_TYPE(ash::switches::kAshNotify),
733 }, 740 },
734 #endif 741 #endif // defined(USE_ASH)
735 }; 742 };
736 743
737 const Experiment* experiments = kExperiments; 744 const Experiment* experiments = kExperiments;
738 size_t num_experiments = arraysize(kExperiments); 745 size_t num_experiments = arraysize(kExperiments);
739 746
740 // Stores and encapsulates the little state that about:flags has. 747 // Stores and encapsulates the little state that about:flags has.
741 class FlagsState { 748 class FlagsState {
742 public: 749 public:
743 FlagsState() : needs_restart_(false) {} 750 FlagsState() : needs_restart_(false) {}
744 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); 751 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 } 1167 }
1161 1168
1162 const Experiment* GetExperiments(size_t* count) { 1169 const Experiment* GetExperiments(size_t* count) {
1163 *count = num_experiments; 1170 *count = num_experiments;
1164 return experiments; 1171 return experiments;
1165 } 1172 }
1166 1173
1167 } // namespace testing 1174 } // namespace testing
1168 1175
1169 } // namespace about_flags 1176 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698