[Athena: Cleanup] consolidate ChromeAppActivity and ShellAppActivity

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/content/app_activity_registry.h"
 #include "athena/content/content_proxy.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 "extensions/browser/app_window/app_window.h"
 #include "ui/aura/window.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 
 namespace athena {
 
 // TODO(mukai): specifies the same accelerators of WebActivity.
-AppActivity::AppActivity(const std::string& app_id)
-    : app_id_(app_id),
-      web_view_(NULL),
+AppActivity::AppActivity(extensions::AppWindow* app_window,
+                         views::WebView* web_view)
+    : app_id_(app_window->extension_id()),
+      web_view_(web_view),
       current_state_(ACTIVITY_UNLOADED),
       app_activity_registry_(NULL) {
+  DCHECK_EQ(app_window->web_contents(), web_view->GetWebContents());
+  Observe(app_window->web_contents());
 }
 
 scoped_ptr<ContentProxy> AppActivity::GetContentProxy(aura::Window* window) {
   if (content_proxy_.get())
     content_proxy_->Reparent(window);
   return content_proxy_.Pass();
 }
 
 ActivityViewModel* AppActivity::GetActivityViewModel() {
   return this;
@@ skipping 82 matching lines @@
 }
 
 gfx::ImageSkia AppActivity::GetIcon() const {
   return gfx::ImageSkia();
 }
 
 bool AppActivity::UsesFrame() const {
   return false;
 }
 
+views::Widget* AppActivity::CreateWidget() {
+  // Make sure the content gets properly shown.
+  if (current_state_ == ACTIVITY_VISIBLE) {
+    HideContentProxy();
+  } else if (current_state_ == ACTIVITY_INVISIBLE) {
+    ShowContentProxy();
+  } else {
+    // If not previously specified, we change the state now to invisible..
+    SetCurrentState(ACTIVITY_INVISIBLE);
+  }
+  RegisterActivity();
+  return web_view_->GetWidget();
+}
+
 views::View* AppActivity::GetContentsView() {
-  if (!web_view_) {
-    web_view_ = GetWebView();
-    // Make sure the content gets properly shown.
-    if (current_state_ == ACTIVITY_VISIBLE) {
-      HideContentProxy();
-    } else if (current_state_ == ACTIVITY_INVISIBLE) {
-      ShowContentProxy();
-    } else {
-      // If not previously specified, we change the state now to invisible..
-      SetCurrentState(ACTIVITY_INVISIBLE);
-    }
-    RegisterActivity();
-  }
   return web_view_;
 }
 
 gfx::ImageSkia AppActivity::GetOverviewModeImage() {
   if (content_proxy_.get())
     return content_proxy_->GetContentImage();
   return gfx::ImageSkia();
 }
 
 void AppActivity::PrepareContentsForOverview() {
   // 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(true);
 }
 
 void AppActivity::ResetContentsView() {
   // 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();
   }
 }
 
+AppActivity::AppActivity(const std::string& app_id)
+    : app_id_(app_id),
+      web_view_(NULL),
+      current_state_(ACTIVITY_UNLOADED),
+      app_activity_registry_(NULL) {
+}
+
 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);
 }
@@ skipping 20 matching lines @@
 void AppActivity::HideContentProxy() {
   content_proxy_.reset();
 }
 
 void AppActivity::ShowContentProxy() {
   if (!content_proxy_.get() && web_view_)
     content_proxy_.reset(new ContentProxy(web_view_, this));
 }
 
 }  // namespace athena