Re-factor Ash Message Center code part 3/4

ash/system/web_notification/web_notification_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 "ash/system/tray/tray_constants.h"
-#include "ash/system/tray/tray_views.h"
-#include "ash/system/web_notification/web_notification.h"
-#include "ash/system/web_notification/web_notification_tray.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_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/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
-namespace ash {
+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:
-  explicit WebNotificationMenuModel(WebNotificationTray* tray,
-                                    const WebNotification& notification)
+  explicit WebNotificationMenuModel(

[miket_OOO, 2012/10/16 01:05:42]

This guy doesn't need to be explicit (not sure why it was before, probably my
mistake).

[stevenjb, 2012/10/16 19:16:06]

Probably used to take one arg, and more likely my fault :)
Fixed.

+      WebNotificationList::Delegate* list_delegate,
+      const WebNotification& notification)
       : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
-        tray_(tray),
+        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.
@@ skipping 36 matching lines @@
 
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE {
     return false;
   }
 
   virtual void ExecuteCommand(int command_id) OVERRIDE {
     switch (command_id) {
       case kToggleExtensionCommand:
-        tray_->DisableByExtension(notification_.id);
+        list_delegate_->DisableNotificationByExtension(notification_.id);
         break;
       case kTogglePermissionCommand:
-        tray_->DisableByUrl(notification_.id);
+        list_delegate_->DisableNotificationByUrl(notification_.id);
         break;
       case kShowSettingsCommand:
-        tray_->ShowSettings(notification_.id);
+        list_delegate_->ShowNotificationSettings(notification_.id);
         break;
       default:
         NOTREACHED();
     }
   }
 
  private:
-  WebNotificationTray* tray_;
+  WebNotificationList::Delegate* list_delegate_;
   WebNotification notification_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationMenuModel);
 };
 
-WebNotificationView::WebNotificationView(WebNotificationTray* tray,
-                                         const WebNotification& notification,
-                                         int scroll_bar_width)
-    : tray_(tray),
+WebNotificationView::WebNotificationView(
+    WebNotificationList::Delegate* list_delegate,
+    const WebNotification& 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);
@@ skipping 16 matching lines @@
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           IDR_AURA_UBER_TRAY_NOTIFY_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 = kTrayPopupPaddingHorizontal/2;
+  const int padding_width = kPaddingHorizontal/2;

[miket_OOO, 2012/10/16 01:05:42]

whitespace around the /

[stevenjb, 2012/10/16 19:16:06]

Done.

   columns->AddPaddingColumn(0, padding_width);
 
   // Notification Icon.
   columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::LEADING,
                      0, /* resize percent */
                      views::GridLayout::FIXED,
                      kWebNotificationIconSize, kWebNotificationIconSize);
 
   columns->AddPaddingColumn(0, padding_width);
 
   // Notification message text.
   const int message_width = kWebNotificationWidth - kWebNotificationIconSize -
       kWebNotificationButtonWidth - (padding_width * 3) - scroll_bar_width;
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                      100, /* resize percent */
                      views::GridLayout::FIXED,
                      message_width, message_width);
 
   columns->AddPaddingColumn(0, padding_width);
 
   // Close button.
   columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::LEADING,
                      0, /* resize percent */
                      views::GridLayout::FIXED,
                      kWebNotificationButtonWidth,
                      kWebNotificationButtonWidth);
 
   // Layout rows
-  layout->AddPaddingRow(0, kTrayPopupPaddingBetweenItems);
+  layout->AddPaddingRow(0, kPaddingBetweenItems);
 
   layout->StartRow(0, 0);
   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, kTrayPopupPaddingBetweenItems);
+  layout->AddPaddingRow(0, kPaddingBetweenItems);
 }
 
 WebNotificationView::~WebNotificationView() {
 }
 
 bool WebNotificationView::OnMousePressed(const ui::MouseEvent& event) {
   if (event.flags() & ui::EF_RIGHT_MOUSE_BUTTON) {
     ShowMenu(event.location());
     return true;
   }
-  tray_->OnClicked(notification_.id);
+  list_delegate_->OnNotificationClicked(notification_.id);
   return true;
 }
 
 ui::EventResult WebNotificationView::OnGestureEvent(
     const ui::GestureEvent& event) {
   if (event.type() == ui::ET_GESTURE_TAP) {
-    tray_->OnClicked(notification_.id);
+    list_delegate_->OnNotificationClicked(notification_.id);
     return ui::ER_CONSUMED;
   }
 
   if (event.type() == ui::ET_GESTURE_LONG_PRESS) {
     ShowMenu(event.location());
     return ui::ER_CONSUMED;
   }
 
   if (event.type() == ui::ET_SCROLL_FLING_START) {
     // The threshold for the fling velocity is computed empirically.
@@ skipping 34 matching lines @@
   }
 
   if (scroller_)
     scroller_->OnGestureEvent(event);
   return ui::ER_CONSUMED;
 }
 
 void WebNotificationView::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   if (sender == close_button_)
-    tray_->SendRemoveNotification(notification_.id);
+    list_delegate_->SendRemoveNotification(notification_.id);
 }
 
 void WebNotificationView::OnImplicitAnimationsCompleted() {
-  tray_->SendRemoveNotification(notification_.id);
+  list_delegate_->SendRemoveNotification(notification_.id);
 }
 
 void WebNotificationView::ShowMenu(gfx::Point screen_location) {
-  WebNotificationMenuModel menu_model(tray_, notification_);
+  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,
@@ skipping 20 matching lines @@
       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
-
-}  // namespace ash