Notification: Implement two-leveled notification.

ui/message_center/views/notification_view_md.h

Index: ui/message_center/views/notification_view_md.h
diff --git a/ui/message_center/views/notification_view_md.h b/ui/message_center/views/notification_view_md.h
index c4d76ecfc1d6d5aab4034df13ad9d950e192d945..8cc6223abd54dbddf68622e05cc05c4310b393d0 100644
--- a/ui/message_center/views/notification_view_md.h
+++ b/ui/message_center/views/notification_view_md.h
@@ -12,18 +12,18 @@
 #include "ui/message_center/message_center_export.h"
 #include "ui/message_center/views/message_view.h"
 #include "ui/views/controls/button/button.h"
-#include "ui/views/controls/button/image_button.h"
 #include "ui/views/view_targeter_delegate.h"
 
 namespace views {
-class BoxLayout;
-class ImageView;
+class Label;
+class LabelButton;
 }
 
 namespace message_center {
 
 class BoundedLabel;
-class NotificationButton;
+class NotificationHeaderView;
+class ProportionalImageView;
 
 // View that displays all current types of notification (web, basic, image, and
 // list) except the custom notification. Future notification types may be
@@ -43,6 +43,7 @@ class MESSAGE_CENTER_EXPORT NotificationViewMD
   void OnFocus() override;
   void ScrollRectToVisible(const gfx::Rect& rect) override;
   gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override;
+  void OnMouseMoved(const ui::MouseEvent& event) override;
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
 
@@ -71,30 +72,35 @@ class MESSAGE_CENTER_EXPORT NotificationViewMD
   void CreateOrUpdateCloseButtonView(const Notification& notification);
   void CreateOrUpdateSettingsButtonView(const Notification& notification);
 
-  // Describes whether the view should display a hand pointer or not.
-  bool clickable_;
+  bool IsExpandable();
+  void ToggleExpanded();
+  void UpdateViewForExpandedState(bool expanded);
 
-  // Views in the top view
-  views::BoxLayout* layout_ = nullptr;
+  // True if this view or its descendant views have focus.
+  bool HasFocusedView();
 
-  // Views in the top view
-  views::View* top_view_ = nullptr;
-  BoundedLabel* context_title_view_ = nullptr;
+  // Whether this notification is expanded or not.
+  bool expanded_ = false;
 
-  // Views in the main view
-  views::View* main_view_ = nullptr;
-  BoundedLabel* title_view_ = nullptr;
-  BoundedLabel* message_view_ = nullptr;
+  // Describes whether the view should display a hand pointer or not.
+  bool clickable_;
 
-  // Views in the bottom view
-  views::View* bottom_view_ = nullptr;
+  // Container views directly attached to this view.
+  NotificationHeaderView* header_row_ = nullptr;

[fukino, 2017/06/08 22:05:48]

I renamed top_view_, main_view_, and bottom_view to header,content,and actions
to use consistent term with the design mock.

+  views::View* content_row_ = nullptr;
+  views::View* actions_row_ = nullptr;
 
-  // Views in the floating controller
-  std::unique_ptr<views::ImageButton> settings_button_;
-  std::unique_ptr<views::ImageButton> close_button_;
-  std::unique_ptr<views::ImageView> small_image_view_;
+  // Containers for left and right side on |content_row_|
+  views::View* left_content_ = nullptr;
+  views::View* right_content_ = nullptr;
 
-  std::vector<NotificationButton*> action_buttons_;
+  // Views which are dinamicallly created inside view hierarchy.
+  views::Label* title_view_ = nullptr;
+  BoundedLabel* message_view_ = nullptr;
+  ProportionalImageView* icon_view_ = nullptr;
+  views::View* image_container_ = nullptr;
+  ProportionalImageView* image_view_ = nullptr;
+  std::vector<views::LabelButton*> action_buttons_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationViewMD);
 };