Remove Activity dependency from content_proxy

athena/content/content_proxy.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/content_proxy.h"
 
-#include "athena/activity/public/activity.h"
-#include "athena/activity/public/activity_view_model.h"
 #include "base/bind.h"
 #include "base/threading/worker_pool.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_png_rep.h"
@@ skipping 34 matching lines @@
     std::vector<unsigned char> data;
     if (gfx::PNGCodec::EncodeA8SkBitmap(bitmap, &data))
       data_ = new base::RefCountedBytes(data);
   }
 
   scoped_refptr<base::RefCountedBytes> data_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyImageData);
 };
 
-ContentProxy::ContentProxy(views::WebView* web_view, Activity* activity)
+ContentProxy::ContentProxy(views::WebView* web_view)
     : web_view_(web_view),
       content_visible_(true),
       content_loaded_(true),
       content_creation_called_(false),
       proxy_content_to_image_factory_(this) {
   // Note: The content will be hidden once the image got created.
   CreateProxyContent();
 }
 
 ContentProxy::~ContentProxy() {
-  // If we still have a connection to the original Activity, we make it visible
-  // again.
+  // If we still have a connection to the original web contents, we make it
+  // visible again.
   ShowOriginalContent();
 }
 
 void ContentProxy::ContentWillUnload() {
   content_loaded_ = false;
 }
 
 gfx::ImageSkia ContentProxy::GetContentImage() {
   // While we compress to PNG, we use the original read back.
   if (!png_data_.get())
@@ skipping 94 matching lines @@
 
 void ContentProxy::OnContentImageEncodeComplete(
     scoped_refptr<ProxyImageData> image) {
   png_data_ = image->data();
 
   // From now on we decode the image as needed to save memory.
   raw_image_ = gfx::ImageSkia();
 }
 
 }  // namespace athena