diff options
| author | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 18:42:36 +0000 |
|---|---|---|
| committer | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 18:42:36 +0000 |
| commit | 6ac6c88c110391acda07fd24590d5b4e5e073d71 (patch) | |
| tree | d3644386678c383cf9086d8474dec63adf012e96 | |
| parent | ba4ba3e7a9a45167aba615ce0704480d1acf33a2 (diff) | |
| download | chromium_src-6ac6c88c110391acda07fd24590d5b4e5e073d71.zip chromium_src-6ac6c88c110391acda07fd24590d5b4e5e073d71.tar.gz chromium_src-6ac6c88c110391acda07fd24590d5b4e5e073d71.tar.bz2 | |
Remove the "Enable Rich Notifications" flag on ChromeOS.
This removes the about:flags option and always uses rich
notifications on ChromeOS.
BUG=254719
Review URL: https://chromiumcodereview.appspot.com/18239002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209461 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/about_flags.cc | 2 | ||||
| -rw-r--r-- | ui/message_center/message_center_util.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 1c614ed..24cf123 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -1339,7 +1339,7 @@ const Experiment kExperiments[] = { "enable-rich-notifications", IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME, IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION, - kOsWin | kOsCrOS | kOsMac, + kOsWin | kOsMac, ENABLE_DISABLE_VALUE_TYPE( message_center::switches::kEnableRichNotifications, message_center::switches::kDisableRichNotifications) diff --git a/ui/message_center/message_center_util.cc b/ui/message_center/message_center_util.cc index ba5027c..c1dc58c 100644 --- a/ui/message_center/message_center_util.cc +++ b/ui/message_center/message_center_util.cc @@ -13,7 +13,9 @@ namespace message_center { // when a time period in Canary indicates the new notifications are acceptable // for default behavior. bool IsRichNotificationEnabled() { -#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(USE_AURA) +#if defined(OS_CHROMEOS) + return true; +#elif !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(USE_AURA) return false; #endif |