diff options
| author | skuhne <skuhne@chromium.org> | 2014-09-25 10:12:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-25 17:12:52 +0000 |
| commit | 7144431a072fad80fc82ee87e7216011c534ef3b (patch) | |
| tree | 0597db5d005fb64e83bf43a4576161703ee04bed /athena/content/app_activity.h | |
| parent | 5627b3628bdbafc79c2a39f906c4c9adbcaaf8c5 (diff) | |
| download | chromium_src-7144431a072fad80fc82ee87e7216011c534ef3b.zip chromium_src-7144431a072fad80fc82ee87e7216011c534ef3b.tar.gz chromium_src-7144431a072fad80fc82ee87e7216011c534ef3b.tar.bz2 | |
Creating PNG images from web content to be used by OverviewMode navigation
This patch reads back content from the GPU in quarter res and stores it (in memory) as PNG.
The OverviewMode can then grab an image through an activity to present it accordingly.
Since we do not have browser test framework for Athena, there is no unit test yet.
I took however issue 412474 on to mitigate that and I will use this test as the gunieapig test.
In the meantime sadrul@chromium.org can start using this for his overviewmode presentation development.
BUG=408837
TEST=Visual: Added Logging statements to see that the code gets properly executed.
Review URL: https://codereview.chromium.org/591693002
Cr-Commit-Position: refs/heads/master@{#296729}
Diffstat (limited to 'athena/content/app_activity.h')
| -rw-r--r-- | athena/content/app_activity.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/athena/content/app_activity.h b/athena/content/app_activity.h index 6406a62..cc1a0c8 100644 --- a/athena/content/app_activity.h +++ b/athena/content/app_activity.h @@ -10,7 +10,6 @@ #include "athena/content/app_activity_proxy.h" #include "base/memory/scoped_ptr.h" #include "content/public/browser/web_contents_observer.h" -#include "ui/gfx/image/image_skia.h" namespace extensions { class AppWindow; @@ -33,8 +32,8 @@ class AppActivity : public Activity, public: AppActivity(extensions::AppWindow* app_window, views::WebView* web_view); - // Gets the content proxy so that the AppProxy can take it over. - scoped_ptr<ContentProxy> GetContentProxy(aura::Window* window); + // Gets the content proxy so that the AppActivityProxy can take it over. + scoped_ptr<ContentProxy> GetContentProxy(); // Activity: virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE; |