Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: athena/content/content_proxy.cc

Issue 614283002: Remove Activity dependency from content_proxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/content/content_proxy.h ('k') | athena/content/web_activity.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/content_proxy.cc
diff --git a/athena/content/content_proxy.cc b/athena/content/content_proxy.cc
index bcef5444466683811be764ce26d2859f508524df..121d7ad2011359d78c642deef8a8a667da26dbd9 100644
--- a/athena/content/content_proxy.cc
+++ b/athena/content/content_proxy.cc
@@ -4,8 +4,6 @@
#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"
@@ -60,7 +58,7 @@ class ProxyImageData : public base::RefCountedThreadSafe<ProxyImageData> {
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),
@@ -71,8 +69,8 @@ ContentProxy::ContentProxy(views::WebView* web_view, Activity* activity)
}
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();
}
« no previous file with comments | « athena/content/content_proxy.h ('k') | athena/content/web_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698