OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "ui/message_center/message_center_util.h" | 5 #include "ui/message_center/message_center_util.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "ui/message_center/message_center_switches.h" | 8 #include "ui/message_center/message_center_switches.h" |
9 | 9 |
10 namespace message_center { | 10 namespace message_center { |
11 | 11 |
12 // TODO(dimich): remove this function and the kEnableRichNotifications flag | 12 // TODO(dimich): remove this function and the kEnableRichNotifications flag |
13 // when a time period in Canary indicates the new notifications are acceptable | 13 // when a time period in Canary indicates the new notifications are acceptable |
14 // for default behavior. | 14 // for default behavior. |
15 bool IsRichNotificationEnabled() { | 15 bool IsRichNotificationEnabled() { |
16 #if defined(OS_CHROMEOS) | 16 #if defined(OS_CHROMEOS) || defined(OS_MACOSX) |
17 return true; | 17 return true; |
18 #elif !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(USE_AURA) | 18 #elif !defined(OS_WIN) && !defined(USE_AURA) |
19 return false; | 19 return false; |
20 #endif | 20 #endif |
21 | 21 |
22 if (CommandLine::ForCurrentProcess()->HasSwitch( | 22 if (CommandLine::ForCurrentProcess()->HasSwitch( |
23 switches::kDisableRichNotifications)) { | 23 switches::kDisableRichNotifications)) { |
24 return false; | 24 return false; |
25 } | 25 } |
26 if (CommandLine::ForCurrentProcess()->HasSwitch( | 26 if (CommandLine::ForCurrentProcess()->HasSwitch( |
27 switches::kEnableRichNotifications)) { | 27 switches::kEnableRichNotifications)) { |
28 return true; | 28 return true; |
29 } | 29 } |
30 | 30 |
31 return true; | 31 return true; |
32 } | 32 } |
33 | 33 |
34 } // namespace message_center | 34 } // namespace message_center |
OLD | NEW |