athena: Introduce ActivityView.

athena/content/app_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/app_activity.h"
 
 #include "athena/activity/public/activity_manager.h"
+#include "athena/activity/public/activity_view.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/content/content_proxy.h"
 #include "athena/content/media_utils.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/public/window_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/aura/window.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_util.h"
 
 namespace athena {
 
 // TODO(mukai): specifies the same accelerators of WebActivity.
 AppActivity::AppActivity(const std::string& app_id, views::WebView* web_view)
     : app_id_(app_id),
       web_view_(web_view),
       current_state_(ACTIVITY_UNLOADED),
-      app_activity_registry_(nullptr) {
+      app_activity_registry_(nullptr),
+      activity_view_(nullptr) {
   Observe(web_view->GetWebContents());
 }
 
 scoped_ptr<ContentProxy> AppActivity::GetContentProxy() {
   // Note: After this call, the content is still valid because the contents
   // destruction will destroy this |AppActivity| object.
   if (content_proxy_.get())
     content_proxy_->OnPreContentDestroyed();
   return content_proxy_.Pass();
 }
@@ skipping 121 matching lines @@
 }
 
 base::string16 AppActivity::GetTitle() const {
   return web_view_->GetWebContents()->GetTitle();
 }
 
 gfx::ImageSkia AppActivity::GetIcon() const {
   return gfx::ImageSkia();
 }
 
+void AppActivity::SetActivityView(ActivityView* view) {

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

DCHECK(!activitY_view_) ?

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

Done.

+  activity_view_ = view;
+}
+
 bool AppActivity::UsesFrame() const {
   return false;
 }
 
 views::View* AppActivity::GetContentsView() {
   return web_view_;
 }
 
 gfx::ImageSkia AppActivity::GetOverviewModeImage() {
   if (content_proxy_.get())
@@ skipping 25 matching lines @@
 }
 
 AppActivity::~AppActivity() {
   // If this activity is registered, we unregister it now.
   if (app_activity_registry_)
     app_activity_registry_->UnregisterAppActivity(this);
 }
 
 void AppActivity::TitleWasSet(content::NavigationEntry* entry,
                               bool explicit_set) {
-  ActivityManager::Get()->UpdateActivity(this);
+  if (activity_view_)
+    activity_view_->UpdateTitle();
 }
 
 void AppActivity::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
-  ActivityManager::Get()->UpdateActivity(this);
+  if (activity_view_)
+    activity_view_->UpdateIcon();
 }
 
 // Register an |activity| with an application.
 // Note: This should only get called once for an |app_window| of the
 // |activity|.
 void AppActivity::RegisterActivity() {
   content::WebContents* web_contents = web_view_->GetWebContents();
   AppRegistry* app_registry = AppRegistry::Get();
   // Get the application's registry.
   app_activity_registry_ = app_registry->GetAppActivityRegistry(
       app_id_, web_contents->GetBrowserContext());
   DCHECK(app_activity_registry_);
   // Register the activity.
   app_activity_registry_->RegisterAppActivity(this);
 }
 
 void AppActivity::HideContentProxy() {
   content_proxy_.reset();
 }
 
 void AppActivity::ShowContentProxy() {
   if (!content_proxy_.get() && web_view_)
     content_proxy_.reset(new ContentProxy(web_view_));
 }
 
 }  // namespace athena