[Athena] Hack to display favicons for web activities in overview mode

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 "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/client_view.h"
 
 namespace athena {
 namespace {
 
 // The icon size.
 const int kIconSize = 32;
 
 // The distance between the icon and the title when the icon is visible.
-const int kIconTitleSpacing = 5;
+const int kIconTitleSpacing = 10;
 
 // The height of the top border necessary to display the title without the icon.
 const int kDefaultTitleHeight = 25;
 
 // The height of the top border in overview mode.
 const int kOverviewTitleHeight = 55;
 
 // The height of the top border for fullscreen and frameless activities in
 // overview mode.
 const int kOverviewShortTitleHeight = 30;
 
 // The thickness of the left, right and bottom borders in overview mode.
 const int kOverviewBorderThickness = 5;
 
 }  // namespace
 
 // static
 const char ActivityFrameView::kViewClassName[] = "ActivityFrameView";
 
 ActivityFrameView::ActivityFrameView(views::Widget* frame,
                                      ActivityViewModel* view_model)
     : frame_(frame),
       view_model_(view_model),
       title_(new views::Label),
       icon_(new views::ImageView),
       in_overview_(false) {
   title_->SetEnabledColor(SkColorSetA(SK_ColorBLACK, 0xe5));
 
-  SkBitmap bitmap;
-  bitmap.allocN32Pixels(kIconSize, kIconSize);
-  bitmap.eraseARGB(255, 0, 255, 0);
-  icon_->SetImage(gfx::ImageSkia::CreateFrom1xBitmap(bitmap));
-
   AddChildView(title_);
   AddChildView(icon_);
 
-  SkColor bgcolor = view_model_->GetRepresentativeColor();
-  set_background(views::Background::CreateSolidBackground(bgcolor));
   UpdateWindowTitle();
+  UpdateWindowIcon();
 
   WindowManager::GetInstance()->AddObserver(this);
 }
 
 ActivityFrameView::~ActivityFrameView() {
   WindowManager::GetInstance()->RemoveObserver(this);
 }
 
 gfx::Rect ActivityFrameView::GetBoundsForClientView() const {
   gfx::Rect client_bounds = bounds();
@@ skipping 20 matching lines @@
 }
 
 void ActivityFrameView::GetWindowMask(const gfx::Size& size,
                                       gfx::Path* window_mask) {
 }
 
 void ActivityFrameView::ResetWindowControls() {
 }
 
 void ActivityFrameView::UpdateWindowIcon() {
-  if (!view_model_->UsesFrame())
-    return;
-
-  SkColor bgcolor = view_model_->GetRepresentativeColor();
-  set_background(views::Background::CreateSolidBackground(bgcolor));
-  title_->SetBackgroundColor(bgcolor);
-  SchedulePaint();

[sadrul, 2014/09/07 05:39:18]

You need to keep this here. See https://codereview.chromium.org/549593002/

[pkotwicz, 2014/09/08 21:36:17]

You're right. Thanks for catching this!

+  icon_->SetImage(view_model_->GetIcon());
 }
 
 void ActivityFrameView::UpdateWindowTitle() {
+  // The activity has a frame in overview mode regardless of the value of
+  // ActivityViewModel::UsesFrame().
+  SkColor bgcolor = view_model_->GetRepresentativeColor();
+  set_background(views::Background::CreateSolidBackground(bgcolor));
+
   if (!view_model_->UsesFrame())
     return;
+  title_->SetBackgroundColor(bgcolor);
   title_->SetText(frame_->widget_delegate()->GetWindowTitle());
   Layout();
 }
 
 gfx::Size ActivityFrameView::GetPreferredSize() const {
   gfx::Size pref = frame_->client_view()->GetPreferredSize();
   gfx::Rect bounds(0, 0, pref.width(), pref.height());
   return frame_->non_client_view()
       ->GetWindowBoundsForClientBounds(bounds)
       .size();
@@ skipping 77 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