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

athena/content/web_activity.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/content/web_activity.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/input/public/accelerator_manager.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/favicon_base/select_favicon_frames.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/favicon_url.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/closure_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget.h"
 
 namespace athena {
 namespace {
@@ skipping 110 matching lines @@
   views::WebView* web_view_;
   bool reserved_accelerator_enabled_;
   scoped_ptr<AcceleratorManager> accelerator_manager_;
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(WebActivityController);
 };
 
 const SkColor kDefaultTitleColor = SkColorSetRGB(0xf2, 0xf2, 0xf2);
 const SkColor kDefaultUnavailableColor = SkColorSetRGB(0xbb, 0x77, 0x77);
+const int kIconSize = 32;
 
 }  // namespace
 
 // A web view for athena's web activity. Note that AthenaWebView will create its
 // own content so that it can eject and reload it.
 class AthenaWebView : public views::WebView {
  public:
   AthenaWebView(content::BrowserContext* context)
       : views::WebView(context), controller_(new WebActivityController(this)),
         fullscreen_(false) {
@@ skipping 167 matching lines @@
 };
 
 WebActivity::WebActivity(content::BrowserContext* browser_context,
                          const base::string16& title,
                          const GURL& url)
     : browser_context_(browser_context),
       title_(title),
       url_(url),
       web_view_(NULL),
       title_color_(kDefaultTitleColor),
-      current_state_(ACTIVITY_UNLOADED) {
+      current_state_(ACTIVITY_UNLOADED),
+      weak_ptr_factory_(this) {
 }
 
 WebActivity::WebActivity(AthenaWebView* web_view)
     : browser_context_(web_view->browser_context()),
       url_(web_view->GetWebContents()->GetURL()),
       web_view_(web_view),
-      current_state_(ACTIVITY_UNLOADED) {
+      current_state_(ACTIVITY_UNLOADED),
+      weak_ptr_factory_(this) {
   // Transition to state ACTIVITY_INVISIBLE to perform the same setup steps
   // as on new activities (namely adding a WebContentsObserver).
   SetCurrentState(ACTIVITY_INVISIBLE);
 }
 
 WebActivity::~WebActivity() {
   // It is not required to change the activity state to UNLOADED - unless we
   // would add state observers.
 }
 
@@ skipping 61 matching lines @@
 aura::Window* WebActivity::GetWindow() {
   return !web_view_ ? NULL : web_view_->GetWidget()->GetNativeWindow();
 }
 
 void WebActivity::Init() {
   DCHECK(web_view_);
   web_view_->InstallAccelerators();
 }
 
 SkColor WebActivity::GetRepresentativeColor() const {
-  // TODO(sad): Compute the color from the favicon.
   return web_view_ ? title_color_ : kDefaultUnavailableColor;
 }
 
 base::string16 WebActivity::GetTitle() const {
   if (!title_.empty())
     return title_;
   // TODO(oshima): Use title set by the web contents.
   return web_view_ ? base::UTF8ToUTF16(
                          web_view_->GetWebContents()->GetVisibleURL().host())
                    : base::string16();
 }
 
+gfx::ImageSkia WebActivity::GetIcon() const {
+  return icon_;
+}
+
 bool WebActivity::UsesFrame() const {
   return true;
 }
 
 views::View* WebActivity::GetContentsView() {
   if (!web_view_) {
     web_view_ = new AthenaWebView(browser_context_);
     web_view_->LoadInitialURL(url_);
     // Make sure the content gets properly shown.
     if (current_state_ == ACTIVITY_VISIBLE) {
@@ skipping 27 matching lines @@
 void WebActivity::ResetContentsView() {
   web_view_->SetFastResize(false);
   web_view_->Layout();
 }
 
 void WebActivity::TitleWasSet(content::NavigationEntry* entry,
                               bool explicit_set) {
   ActivityManager::Get()->UpdateActivity(this);
 }
 
+void WebActivity::DidNavigateMainFrame(
+    const content::LoadCommittedDetails& details,
+    const content::FrameNavigateParams& params) {
+  // Prevent old image requests from calling back to OnDidDownloadFavicon().
+  weak_ptr_factory_.InvalidateWeakPtrs();
+  icon_ = gfx::ImageSkia();
+  ActivityManager::Get()->UpdateActivity(this);
+}
+
 void WebActivity::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
+  // Pick an arbitrary favicon of type FAVICON to use.
+  // TODO(pkotwicz): Do something better once the favicon code is componentized.
+  // (crbug.com/401997)
+  for (size_t i = 0; i < candidates.size(); ++i) {
+    if (candidates[i].icon_type == content::FaviconURL::FAVICON) {
+      weak_ptr_factory_.InvalidateWeakPtrs();

[sadrul, 2014/09/11 01:03:17]

Should we invalidate regardless of whether we have a valid candidate favicon?

+      web_view_->GetWebContents()->DownloadImage(
+          candidates[i].icon_url,
+          true,
+          0,
+          base::Bind(&WebActivity::OnDidDownloadFavicon,
+                     weak_ptr_factory_.GetWeakPtr()));
+      break;
+    }
+  }
+}
+
+void WebActivity::OnDidDownloadFavicon(
+    int id,
+    int http_status_code,
+    const GURL& url,
+    const std::vector<SkBitmap>& bitmaps,
+    const std::vector<gfx::Size>& original_bitmap_sizes) {
+  if (icon_url_ != url) {

[sadrul, 2014/09/11 01:03:17]

Remove.

+    // This is the icon for an old request.
+    return;
+  }
+
+  icon_ = CreateFaviconImageSkia(
+      bitmaps, original_bitmap_sizes, kIconSize, NULL);
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 void WebActivity::DidChangeThemeColor(SkColor theme_color) {
   title_color_ = theme_color;
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 void WebActivity::MakeVisible() {
   // TODO(skuhne): Once we know how to handle the Overview mode, this has to
@@ skipping 30 matching lines @@
 
 void WebActivity::ReloadAndObserve() {
   if (web_view_->IsContentEvicted()) {
     DCHECK_EQ(ACTIVITY_UNLOADED, current_state_);
     web_view_->ReloadContent();
   }
   Observe(web_view_->GetWebContents());
 }
 
 }  // namespace athena