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

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

Issue 2892893002: Initial implementation of new-style notification (Closed)
Patch Set: Fixed build failure Created 3 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
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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 ash::switches::kAshShelfColorSchemeLightMuted}, 436 ash::switches::kAshShelfColorSchemeLightMuted},
437 {flag_descriptions::kAshShelfColorSchemeNormalMuted, 437 {flag_descriptions::kAshShelfColorSchemeNormalMuted,
438 ash::switches::kAshShelfColorScheme, 438 ash::switches::kAshShelfColorScheme,
439 ash::switches::kAshShelfColorSchemeNormalMuted}, 439 ash::switches::kAshShelfColorSchemeNormalMuted},
440 {flag_descriptions::kAshShelfColorSchemeDarkMuted, 440 {flag_descriptions::kAshShelfColorSchemeDarkMuted,
441 ash::switches::kAshShelfColorScheme, 441 ash::switches::kAshShelfColorScheme,
442 ash::switches::kAshShelfColorSchemeDarkMuted}, 442 ash::switches::kAshShelfColorSchemeDarkMuted},
443 }; 443 };
444 #endif // USE_ASH 444 #endif // USE_ASH
445 445
446 #if !defined(OS_ANDROID)
447 const FeatureEntry::Choice kMessageCenterNewStyleNotificationChoices[] = {
448 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
449 {flags_ui::kGenericExperimentChoiceEnabled,
450 switches::kMessageCenterNewStyleNotification,
451 switches::kMessageCenterNewStyleNotificationEnabled},
452 {flags_ui::kGenericExperimentChoiceDisabled,
453 switches::kMessageCenterNewStyleNotification,
454 switches::kMessageCenterNewStyleNotificationDisabled}};
455 #endif // !OS_ANDROID
456
446 #if defined(OS_CHROMEOS) 457 #if defined(OS_CHROMEOS)
447 const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = { 458 const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = {
448 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 459 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
449 {flag_descriptions::kMaterialDesignInkDropAnimationFast, 460 {flag_descriptions::kMaterialDesignInkDropAnimationFast,
450 switches::kMaterialDesignInkDropAnimationSpeed, 461 switches::kMaterialDesignInkDropAnimationSpeed,
451 switches::kMaterialDesignInkDropAnimationSpeedFast}, 462 switches::kMaterialDesignInkDropAnimationSpeedFast},
452 {flag_descriptions::kMaterialDesignInkDropAnimationSlow, 463 {flag_descriptions::kMaterialDesignInkDropAnimationSlow,
453 switches::kMaterialDesignInkDropAnimationSpeed, 464 switches::kMaterialDesignInkDropAnimationSpeed,
454 switches::kMaterialDesignInkDropAnimationSpeedSlow}}; 465 switches::kMaterialDesignInkDropAnimationSpeedSlow}};
455 466
(...skipping 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after
1839 {"drop-sync-credential", flag_descriptions::kDropSyncCredentialName, 1850 {"drop-sync-credential", flag_descriptions::kDropSyncCredentialName,
1840 flag_descriptions::kDropSyncCredentialDescription, kOsAll, 1851 flag_descriptions::kDropSyncCredentialDescription, kOsAll,
1841 FEATURE_VALUE_TYPE(password_manager::features::kDropSyncCredential)}, 1852 FEATURE_VALUE_TYPE(password_manager::features::kDropSyncCredential)},
1842 #if !defined(OS_ANDROID) 1853 #if !defined(OS_ANDROID)
1843 {"enable-message-center-always-scroll-up-upon-notification-removal", 1854 {"enable-message-center-always-scroll-up-upon-notification-removal",
1844 flag_descriptions::kMessageCenterAlwaysScrollUpUponRemovalName, 1855 flag_descriptions::kMessageCenterAlwaysScrollUpUponRemovalName,
1845 flag_descriptions::kMessageCenterAlwaysScrollUpUponRemovalDescription, 1856 flag_descriptions::kMessageCenterAlwaysScrollUpUponRemovalDescription,
1846 kOsDesktop, 1857 kOsDesktop,
1847 SINGLE_VALUE_TYPE( 1858 SINGLE_VALUE_TYPE(
1848 switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)}, 1859 switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)},
1860 {"enable-message-center-new-style-notification",
1861 flag_descriptions::kMessageCenterNewStyleNotificationName,
1862 flag_descriptions::kMessageCenterNewStyleNotificationDescription,
1863 kOsDesktop, MULTI_VALUE_TYPE(kMessageCenterNewStyleNotificationChoices)},
fukino 2017/05/25 07:35:10 Can we use ENABLE_DISABLE_VALUE_TYPE to make relat
yoshiki 2017/05/29 03:52:38 I want to make it tri-state since we may re-disabl
fukino 2017/05/30 07:32:32 We have Enable/Disable/Default in chrome://flags f
yoshiki 2017/05/31 03:53:01 Ah, I confused with SINGLE_VALUE_TYPE. Ok, let me
1849 #endif // !OS_ANDROID 1864 #endif // !OS_ANDROID
1850 {"enable-md-policy-page", 1865 {"enable-md-policy-page",
1851 flag_descriptions::kEnableMaterialDesignPolicyPageName, 1866 flag_descriptions::kEnableMaterialDesignPolicyPageName,
1852 flag_descriptions::kEnableMaterialDesignPolicyPageDescription, kOsDesktop, 1867 flag_descriptions::kEnableMaterialDesignPolicyPageDescription, kOsDesktop,
1853 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignPolicyPage)}, 1868 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignPolicyPage)},
1854 #if defined(OS_CHROMEOS) 1869 #if defined(OS_CHROMEOS)
1855 {"memory-pressure-thresholds", 1870 {"memory-pressure-thresholds",
1856 flag_descriptions::kMemoryPressureThresholdName, 1871 flag_descriptions::kMemoryPressureThresholdName,
1857 flag_descriptions::kMemoryPressureThresholdDescription, kOsCrOS, 1872 flag_descriptions::kMemoryPressureThresholdDescription, kOsCrOS,
1858 MULTI_VALUE_TYPE(kMemoryPressureThresholdChoices)}, 1873 MULTI_VALUE_TYPE(kMemoryPressureThresholdChoices)},
(...skipping 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after
3236 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3251 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3237 3252
3238 const FeatureEntry* GetFeatureEntries(size_t* count) { 3253 const FeatureEntry* GetFeatureEntries(size_t* count) {
3239 *count = arraysize(kFeatureEntries); 3254 *count = arraysize(kFeatureEntries);
3240 return kFeatureEntries; 3255 return kFeatureEntries;
3241 } 3256 }
3242 3257
3243 } // namespace testing 3258 } // namespace testing
3244 3259
3245 } // namespace about_flags 3260 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/flag_descriptions.h » ('j') | ui/message_center/views/message_view_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698