3 files changed, 5 insertions, 18 deletions
diff --git a/ui/message_center/message_center_switches.cc b/ui/message_center/message_center_switches.cc
index 9603f94..638f79d 100644
--- a/ui/message_center/message_center_switches.cc
+++ b/ui/message_center/message_center_switches.cc
@@ -9,7 +9,5 @@ namespace switches {
 
 const char kEnableRichNotifications[] = "enable-rich-notifications";
 
-const char kEnableNewSimpleNotifications[] = "enable-new-simple-notifications";
-
 }  // namespace switches
 }  // namespace message_center
diff --git a/ui/message_center/message_center_switches.h b/ui/message_center/message_center_switches.h
index 64e79cb..841e42b 100644
--- a/ui/message_center/message_center_switches.h
+++ b/ui/message_center/message_center_switches.h
@@ -21,14 +21,6 @@ namespace switches {
 //  - WebNotificationButtonViewBase: merge into WebNotificationButtonView.
 MESSAGE_CENTER_EXPORT extern const char kEnableRichNotifications[];
 
-// Enables simple notifications with the new templates defined as part of rich
-// notifications. When kEnableRichNotifications is set those templates will be
-// used regardless of whether this flag is set, but this flag allows us to get
-// the new templates even when kEnableRichNotifications is not set. This is
-// useful for now because the kEnableRichNotifications functionality isn't
-// complete. TODO(dharcourt): Remove when kEnableRichNotifications is ready.
-MESSAGE_CENTER_EXPORT extern const char kEnableNewSimpleNotifications[];
-
 }  // namespace switches
 }  // namespace message_center
 
diff --git a/ui/message_center/views/notification_view.cc b/ui/message_center/views/notification_view.cc
index 4386705..c8e2251 100644
--- a/ui/message_center/views/notification_view.cc
+++ b/ui/message_center/views/notification_view.cc
@@ -315,15 +315,12 @@ namespace message_center {
 MessageView* NotificationView::Create(const Notification& notification,
                                       NotificationChangeObserver* observer,
                                       bool expanded) {
-  // For the time being, use MessageSimpleView for simple notifications unless
-  // one of the use-the-new-style flags are set. This preserves the appearance
-  // of notifications created by existing code that uses webkitNotifications.
-  if (notification.type() == NOTIFICATION_TYPE_SIMPLE &&
-      !IsRichNotificationEnabled() &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          message_center::switches::kEnableNewSimpleNotifications)) {
+  // Use MessageSimpleView for simple notifications unless rich style
+  // notifications are enabled. This preserves the appearance of notifications
+  // created by existing code that uses webkitNotifications.
+  if (!IsRichNotificationEnabled() &&
+      notification.type() == NOTIFICATION_TYPE_SIMPLE)
     return new MessageSimpleView(notification, observer);
-  }
 
   switch (notification.type()) {
     case NOTIFICATION_TYPE_BASE_FORMAT: