Move ash/system/web_notification message_center to ui/

ui/message_center/message_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/web_notification/web_notification_view.h"
+#include "ui/message_center/message_view.h"
 
-#include "grit/ash_resources.h"
-#include "grit/ash_strings.h"
+#include "grit/ui_resources.h"
+#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
-#include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
+#include "ui/views/controls/scroll_view.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 const int kPaddingHorizontal = 18;
 const int kPaddingBetweenItems = 10;
 }
 
 namespace message_center {
 
 const SkColor kNotificationColor = SkColorSetRGB(0xfe, 0xfe, 0xfe);
 const SkColor kNotificationReadColor = SkColorSetRGB(0xfa, 0xfa, 0xfa);
 
 // Menu constants
 const int kTogglePermissionCommand = 0;
 const int kToggleExtensionCommand = 1;
 const int kShowSettingsCommand = 2;
 
 // A dropdown menu for notifications.
 class WebNotificationMenuModel : public ui::SimpleMenuModel,
                                  public ui::SimpleMenuModel::Delegate {
  public:
-  WebNotificationMenuModel(WebNotificationList::Delegate* list_delegate,
-                           const WebNotification& notification)
+  WebNotificationMenuModel(NotificationList::Delegate* list_delegate,
+                           const NotificationList::Notification& notification)
       : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
         list_delegate_(list_delegate),
         notification_(notification) {
     // Add 'disable notifications' menu item.
     if (!notification.extension_id.empty()) {
       AddItem(kToggleExtensionCommand,
               GetLabelForCommandId(kToggleExtensionCommand));
     } else if (!notification.display_source.empty()) {
       AddItem(kTogglePermissionCommand,
               GetLabelForCommandId(kTogglePermissionCommand));
     }
     // Add settings menu item.
     if (!notification.display_source.empty()) {
       AddItem(kShowSettingsCommand,
               GetLabelForCommandId(kShowSettingsCommand));
     }
   }
 
   virtual ~WebNotificationMenuModel() {
   }
 
   // Overridden from ui::SimpleMenuModel:
   virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE {
     switch (command_id) {
       case kToggleExtensionCommand:
-        return l10n_util::GetStringUTF16(
-            IDS_ASH_WEB_NOTFICATION_TRAY_EXTENSIONS_DISABLE);
+        return l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_EXTENSIONS_DISABLE);
       case kTogglePermissionCommand:
-        return l10n_util::GetStringFUTF16(
-            IDS_ASH_WEB_NOTFICATION_TRAY_SITE_DISABLE,
-            notification_.display_source);
+        return l10n_util::GetStringFUTF16(IDS_MESSAGE_CENTER_SITE_DISABLE,
+                                          notification_.display_source);
       case kShowSettingsCommand:
-        return l10n_util::GetStringUTF16(
-            IDS_ASH_WEB_NOTFICATION_TRAY_SETTINGS);
+        return l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_SETTINGS);
       default:
         NOTREACHED();
     }
     return string16();
   }
 
   // Overridden from ui::SimpleMenuModel::Delegate:
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
     return false;
   }
@@ skipping 18 matching lines @@
         break;
       case kShowSettingsCommand:
         list_delegate_->ShowNotificationSettings(notification_.id);
         break;
       default:
         NOTREACHED();
     }
   }
 
  private:
-  WebNotificationList::Delegate* list_delegate_;
-  WebNotification notification_;
+  NotificationList::Delegate* list_delegate_;
+  NotificationList::Notification notification_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationMenuModel);
 };
 
-WebNotificationView::WebNotificationView(
-    WebNotificationList::Delegate* list_delegate,
-    const WebNotification& notification,
+MessageView::MessageView(
+    NotificationList::Delegate* list_delegate,
+    const NotificationList::Notification& notification,
     int scroll_bar_width)
     : list_delegate_(list_delegate),
       notification_(notification),
       icon_(NULL),
       close_button_(NULL),
       scroller_(NULL),
       gesture_scroll_amount_(0.f) {
   SkColor bg_color = notification.is_read ?
       kNotificationReadColor : kNotificationColor;
   set_background(views::Background::CreateSolidBackground(bg_color));
   SetPaintToLayer(true);
   SetFillsBoundsOpaquely(false);
 
   icon_ = new views::ImageView;
   icon_->SetImageSize(
       gfx::Size(kWebNotificationIconSize, kWebNotificationIconSize));
   icon_->SetImage(notification.image);
 
   views::Label* title = new views::Label(notification.title);
   title->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   title->SetFont(title->font().DeriveFont(0, gfx::Font::BOLD));
   views::Label* message = new views::Label(notification.message);
   message->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   message->SetMultiLine(true);
 
   close_button_ = new views::ImageButton(this);
   close_button_->SetImage(
       views::CustomButton::BS_NORMAL,
-      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          IDR_AURA_UBER_TRAY_NOTIFY_CLOSE));
+      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_MESSAGE_CLOSE));
   close_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                                    views::ImageButton::ALIGN_MIDDLE);
 
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
 
   const int padding_width = kPaddingHorizontal / 2;
   columns->AddPaddingColumn(0, padding_width);
@@ skipping 30 matching lines @@
   layout->AddView(icon_, 1, 2);
   layout->AddView(title, 1, 1);
   layout->AddView(close_button_, 1, 1);
 
   layout->StartRow(0, 0);
   layout->SkipColumns(2);
   layout->AddView(message, 1, 1);
   layout->AddPaddingRow(0, kPaddingBetweenItems);
 }
 
-WebNotificationView::~WebNotificationView() {
+MessageView::~MessageView() {
 }
 
-bool WebNotificationView::OnMousePressed(const ui::MouseEvent& event) {
+bool MessageView::OnMousePressed(const ui::MouseEvent& event) {
   if (event.flags() & ui::EF_RIGHT_MOUSE_BUTTON) {
     ShowMenu(event.location());
     return true;
   }
   list_delegate_->OnNotificationClicked(notification_.id);
   return true;
 }
 
-ui::EventResult WebNotificationView::OnGestureEvent(
+ui::EventResult MessageView::OnGestureEvent(
     const ui::GestureEvent& event) {
   if (event.type() == ui::ET_GESTURE_TAP) {
     list_delegate_->OnNotificationClicked(notification_.id);
     return ui::ER_CONSUMED;
   }
 
   if (event.type() == ui::ET_GESTURE_LONG_PRESS) {
     ShowMenu(event.location());
     return ui::ER_CONSUMED;
   }
@@ skipping 34 matching lines @@
       SlideOutAndClose(gesture_scroll_amount_ < 0 ? SLIDE_LEFT : SLIDE_RIGHT);
     else
       RestoreVisualState();
   }
 
   if (scroller_)
     scroller_->OnGestureEvent(event);
   return ui::ER_CONSUMED;
 }
 
-void WebNotificationView::ButtonPressed(views::Button* sender,
+void MessageView::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   if (sender == close_button_)
     list_delegate_->SendRemoveNotification(notification_.id);
 }
 
-void WebNotificationView::OnImplicitAnimationsCompleted() {
+void MessageView::OnImplicitAnimationsCompleted() {
   list_delegate_->SendRemoveNotification(notification_.id);
 }
 
-void WebNotificationView::ShowMenu(gfx::Point screen_location) {
+void MessageView::ShowMenu(gfx::Point screen_location) {
   WebNotificationMenuModel menu_model(list_delegate_, notification_);
   if (menu_model.GetItemCount() == 0)
     return;
 
   views::MenuModelAdapter menu_model_adapter(&menu_model);
   views::MenuRunner menu_runner(menu_model_adapter.CreateMenu());
 
   views::View::ConvertPointToScreen(this, &screen_location);
   ignore_result(menu_runner.RunMenuAt(
       GetWidget()->GetTopLevelWidget(),
       NULL,
       gfx::Rect(screen_location, gfx::Size()),
       views::MenuItemView::TOPRIGHT,
       views::MenuRunner::HAS_MNEMONICS));
 }
 
-void WebNotificationView::RestoreVisualState() {
+void MessageView::RestoreVisualState() {
   // Restore the layer state.
   const int kSwipeRestoreDurationMS = 150;
   ui::ScopedLayerAnimationSettings settings(layer()->GetAnimator());
   settings.SetTransitionDuration(
       base::TimeDelta::FromMilliseconds(kSwipeRestoreDurationMS));
   layer()->SetTransform(gfx::Transform());
   layer()->SetOpacity(1.f);
 }
 
-void WebNotificationView::SlideOutAndClose(SlideDirection direction) {
+void MessageView::SlideOutAndClose(SlideDirection direction) {
   const int kSwipeOutTotalDurationMS = 150;
   int swipe_out_duration = kSwipeOutTotalDurationMS * layer()->opacity();
   ui::ScopedLayerAnimationSettings settings(layer()->GetAnimator());
   settings.SetTransitionDuration(
       base::TimeDelta::FromMilliseconds(swipe_out_duration));
   settings.AddObserver(this);
 
   gfx::Transform transform;
   transform.SetTranslateX(direction == SLIDE_LEFT ? -width() : width());
   layer()->SetTransform(transform);
   layer()->SetOpacity(0.f);
 }
 
 }  // namespace message_center