athena: Introduce ActivityView.

athena/activity/activity_frame_view.cc

 // Copyright 2014 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 "athena/activity/activity_frame_view.h"
 
 #include "athena/activity/public/activity_view_model.h"
 #include "athena/wm/public/window_manager.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/canvas.h"
@@ skipping 41 matching lines @@
       icon_(new views::ImageView),
       in_overview_(false) {
   title_->SetEnabledColor(SkColorSetA(SK_ColorBLACK, 0xe5));
 
   AddChildView(title_);
   AddChildView(icon_);
 
   UpdateWindowTitle();
   UpdateWindowIcon();
 
+  view_model_->SetActivityView(this);
+
   WindowManager::Get()->AddObserver(this);
 }
 
 ActivityFrameView::~ActivityFrameView() {
   WindowManager::Get()->RemoveObserver(this);
+
+  // |view_model_| is already destroyed at this time. So do not attempt to reset
+  // the activity-view by calling SetActivityView(nullptr);

[oshima, 2014/11/04 23:42:41]

Can you add crbug.com/427113 ?

[sadrul, 2014/11/05 03:36:42]

Done.

 }
 
 gfx::Rect ActivityFrameView::GetBoundsForClientView() const {
   gfx::Rect client_bounds = bounds();
   client_bounds.Inset(NonClientBorderInsets());
   return client_bounds;
 }
 
 gfx::Rect ActivityFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
@@ skipping 85 matching lines @@
 void ActivityFrameView::OnPaintBackground(gfx::Canvas* canvas) {
   View::OnPaintBackground(canvas);
 
   // Paint a border around the client view.
   gfx::Rect border_bounds = GetLocalBounds();
   border_bounds.Inset(NonClientBorderInsets());
   border_bounds.Inset(-1, -1, 0, 0);
   canvas->DrawRect(border_bounds, SkColorSetA(SK_ColorGRAY, 0x7f));
 }
 
+void ActivityFrameView::UpdateTitle() {
+  UpdateWindowTitle();
+}
+
+void ActivityFrameView::UpdateIcon() {
+  UpdateWindowIcon();
+}
+
+void ActivityFrameView::UpdateRepresentativeColor() {
+  UpdateWindowTitle();
+}
+
 void ActivityFrameView::OnOverviewModeEnter() {
   view_model_->PrepareContentsForOverview();
   in_overview_ = true;
   InvalidateLayout();
   frame_->client_view()->InvalidateLayout();
   frame_->GetRootView()->Layout();
   SchedulePaint();
 }
 
 void ActivityFrameView::OnOverviewModeExit() {
@@ skipping 23 matching lines @@
   return in_overview_ ? kOverviewBorderThickness : 0;
 }
 
 int ActivityFrameView::NonClientTopBorderHeight() const {
   if (frame_->IsFullscreen() || !view_model_->UsesFrame())
     return in_overview_ ? kOverviewShortTitleHeight : 0;
   return in_overview_ ? kOverviewTitleHeight : kDefaultTitleHeight;
 }
 
 }  // namespace athena