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

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

Issue 11230050: ash : introduce second SessionStateController implementation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge with TOT, review fixes Created 8 years, 2 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | 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 849 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 kOsCrOS, 860 kOsCrOS,
861 SINGLE_VALUE_TYPE(ash::switches::kAshDisableBootAnimation2), 861 SINGLE_VALUE_TYPE(ash::switches::kAshDisableBootAnimation2),
862 }, 862 },
863 { 863 {
864 "boot-animation-fucntion", 864 "boot-animation-fucntion",
865 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION, 865 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION,
866 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION, 866 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION,
867 kOsCrOS, 867 kOsCrOS,
868 MULTI_VALUE_TYPE(kAshBootAnimationFunction), 868 MULTI_VALUE_TYPE(kAshBootAnimationFunction),
869 }, 869 },
870 {
871 "new-lock-animations",
872 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS,
873 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_DESCRIPTION,
874 kOsCrOS,
875 SINGLE_VALUE_TYPE(ash::switches::kAshNewLockAnimationsEnabled),
876 },
870 #endif 877 #endif
871 { 878 {
872 "enable-views-textfield", 879 "enable-views-textfield",
873 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_NAME, 880 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_NAME,
874 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_DESCRIPTION, 881 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_DESCRIPTION,
875 kOsWin, 882 kOsWin,
876 SINGLE_VALUE_TYPE(switches::kEnableViewsTextfield), 883 SINGLE_VALUE_TYPE(switches::kEnableViewsTextfield),
877 }, 884 },
878 { 885 {
879 "old-checkbox-style", 886 "old-checkbox-style",
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
1399 } 1406 }
1400 1407
1401 const Experiment* GetExperiments(size_t* count) { 1408 const Experiment* GetExperiments(size_t* count) {
1402 *count = num_experiments; 1409 *count = num_experiments;
1403 return experiments; 1410 return experiments;
1404 } 1411 }
1405 1412
1406 } // namespace testing 1413 } // namespace testing
1407 1414
1408 } // namespace about_flags 1415 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698