Creating PNG images from web content to be used by OverviewMode navigation

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 "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),
       current_state_(ACTIVITY_UNLOADED),
       app_activity_registry_(NULL) {
 }
 
-scoped_ptr<ContentProxy> AppActivity::GetContentProxy(aura::Window* window) {
+scoped_ptr<ContentProxy> AppActivity::GetContentProxy() {
   if (content_proxy_.get())
-    content_proxy_->Reparent(window);
+    content_proxy_->ContentGetsDestroyed();

[oshima, 2014/09/22 16:10:28]

At this point, is AppAcitivyt's content supposed to be destroyed?

If so, can we add DCHECK?

[Mr4D (OOO till 08-26), 2014/09/23 19:07:33]

No, not yet. This object will be destroyed because of the content being
destroyed, but this call is being called much earlier. As such as long as this
object lives, the content is still there.

   return content_proxy_.Pass();
 }
 
 ActivityViewModel* AppActivity::GetActivityViewModel() {
   return this;
 }
 
 void AppActivity::SetCurrentState(Activity::ActivityState state) {
   DCHECK_NE(state, current_state_);
   ActivityState current_state = current_state_;
@@ skipping 94 matching lines @@
       ShowContentProxy();
     } else {
       // If not previously specified, we change the state now to invisible..
       SetCurrentState(ACTIVITY_INVISIBLE);
     }
     RegisterActivity();
   }
   return web_view_;
 }
 
-gfx::ImageSkia AppActivity::GetOverviewModeImage() {
+scoped_ptr<gfx::Image> AppActivity::GetOverviewModeImage() {
   if (content_proxy_.get())
     return content_proxy_->GetContentImage();
-  return gfx::ImageSkia();
+  return scoped_ptr<gfx::Image> (new gfx::Image());
 }
 
 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() {
@@ skipping 38 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