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

Unified Diff: athena/test/sample_activity.cc

Issue 477523002: Athena: Adding basic resource management framework (un-/re-loading) of V2 applications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Aaaand another rebase. Created 6 years, 4 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/test/sample_activity.h ('k') | athena/test/test_app_content_control_delegate_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/test/sample_activity.cc
diff --git a/athena/test/sample_activity.cc b/athena/test/sample_activity.cc
index 6c4c06486c909c1e9be71a5f80edd106c4a38b51..8e36ea069bc3ae336b8f8798498749365f77bb88 100644
--- a/athena/test/sample_activity.cc
+++ b/athena/test/sample_activity.cc
@@ -6,6 +6,7 @@
#include "ui/views/background.h"
#include "ui/views/view.h"
+#include "ui/views/widget/widget.h"
namespace athena {
namespace test {
@@ -43,6 +44,11 @@ Activity::ActivityMediaState SampleActivity::GetMediaState() {
return Activity::ACTIVITY_MEDIA_STATE_NONE;
}
+aura::Window* SampleActivity::GetWindow() {
+ return
+ !contents_view_ ? NULL : contents_view_->GetWidget()->GetNativeWindow();
+}
+
void SampleActivity::Init() {
}
« no previous file with comments | « athena/test/sample_activity.h ('k') | athena/test/test_app_content_control_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698