athena: Introduce ActivityView.

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/activity/public/activity_view.h"
 #include "athena/content/content_proxy.h"
 #include "athena/content/media_utils.h"
 #include "athena/content/public/dialogs.h"
 #include "athena/content/web_activity_helpers.h"
 #include "athena/input/public/accelerator_manager.h"
 #include "athena/strings/grit/athena_strings.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"
@@ skipping 531 matching lines @@
   const base::string16& title = web_view_->GetWebContents()->GetTitle();
   if (!title.empty())
     return title;
   return base::UTF8ToUTF16(web_view_->GetWebContents()->GetVisibleURL().host());
 }
 
 gfx::ImageSkia WebActivity::GetIcon() const {
   return icon_;
 }
 
+void WebActivity::SetActivityView(ActivityView* view) {

[oshima, 2014/11/04 22:17:04]

ditto

[sadrul, 2014/11/04 23:26:09]

Done.

+  activity_view_ = view;
+}
+
 bool WebActivity::UsesFrame() const {
   return true;
 }
 
 views::View* WebActivity::GetContentsView() {
   return web_view_;
 }
 
 gfx::ImageSkia WebActivity::GetOverviewModeImage() {
   if (content_proxy_.get())
@@ skipping 12 matching lines @@
   // Turn on fast resizing to avoid re-laying out the web contents when
   // entering / exiting overview mode and the content is visible.
   if (!content_proxy_.get()) {
     web_view_->SetFastResize(false);
     web_view_->Layout();
   }
 }
 
 void WebActivity::TitleWasSet(content::NavigationEntry* entry,
                               bool explicit_set) {
-  ActivityManager::Get()->UpdateActivity(this);
+  if (activity_view_)
+    activity_view_->UpdateTitle();
 }
 
 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);
+  if (activity_view_)
+    activity_view_->UpdateIcon();
 }
 
 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)
   weak_ptr_factory_.InvalidateWeakPtrs();
   for (size_t i = 0; i < candidates.size(); ++i) {
     if (candidates[i].icon_type == content::FaviconURL::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) {
   icon_ = CreateFaviconImageSkia(
       bitmaps, original_bitmap_sizes, kIconSize, nullptr);
-  ActivityManager::Get()->UpdateActivity(this);
+  if (activity_view_)
+    activity_view_->UpdateIcon();
 }
 
 void WebActivity::DidChangeThemeColor(SkColor theme_color) {
   title_color_ = theme_color;
-  ActivityManager::Get()->UpdateActivity(this);
+  if (activity_view_)
+    activity_view_->UpdateRepresentativeColor();
 }
 
 void WebActivity::HideContentProxy() {
   if (content_proxy_.get())
     content_proxy_.reset(nullptr);
 }
 
 void WebActivity::ShowContentProxy() {
   if (!content_proxy_.get())
     content_proxy_.reset(new ContentProxy(web_view_));
 }
 
 }  // namespace athena