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

Unified Diff: trunk/src/athena/test/sample_activity.cc

Issue 497013002: Revert 291221 "Athena: Adding basic resource management framewor..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
Index: trunk/src/athena/test/sample_activity.cc
===================================================================
--- trunk/src/athena/test/sample_activity.cc (revision 291367)
+++ trunk/src/athena/test/sample_activity.cc (working copy)
@@ -6,7 +6,6 @@
#include "ui/views/background.h"
#include "ui/views/view.h"
-#include "ui/views/widget/widget.h"
namespace athena {
namespace test {
@@ -44,11 +43,6 @@
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 | « trunk/src/athena/test/sample_activity.h ('k') | trunk/src/athena/test/test_app_content_control_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698