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

Side by Side Diff: ui/message_center/message_center_util.cc

Issue 15025002: Remove ENABLE_MESSAGE_CENTER (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing static initializer Created 7 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 | « ui/message_center/message_center_util.h ('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) 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_WIN) && !defined(OS_MACOSX) && !defined(USE_ASH)
17 return false;
18 #endif
19
16 if (CommandLine::ForCurrentProcess()->HasSwitch( 20 if (CommandLine::ForCurrentProcess()->HasSwitch(
17 switches::kDisableRichNotifications)) 21 switches::kDisableRichNotifications))
18 return false; 22 return false;
19 if (CommandLine::ForCurrentProcess()->HasSwitch( 23 if (CommandLine::ForCurrentProcess()->HasSwitch(
20 switches::kEnableRichNotifications)) 24 switches::kEnableRichNotifications))
21 return true; 25 return true;
26
27 // Not enabled by default on Mac yet.
22 #if defined(OS_MACOSX) 28 #if defined(OS_MACOSX)
23 return false; 29 return false;
24 #else 30 #endif
31
25 return true; 32 return true;
26 #endif
27 } 33 }
28 34
29 } // namespace message_center 35 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/message_center_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698