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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/test/sample_activity.cc

Issue 603033002: Get FileSelect dialog work on athena (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/test/sample_activity.h ('k') | chrome/browser/ui/views/athena/DEPS » ('j') | chrome/browser/ui/views/athena/DEPS » ('J')
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 849671e25c1aed226e465169f17a6205c5ecf57a..0ea3f2a21499f53ea8b820854608f35e5e9759dd 100644
--- a/athena/test/sample_activity.cc
+++ b/athena/test/sample_activity.cc
@@ -45,8 +45,12 @@ Activity::ActivityMediaState SampleActivity::GetMediaState() {
}
aura::Window* SampleActivity::GetWindow() {
- return
- !contents_view_ ? NULL : contents_view_->GetWidget()->GetNativeWindow();
+ return !contents_view_ ? NULL
+ : contents_view_->GetWidget()->GetNativeWindow();
+}
+
+content::WebContents* SampleActivity::GetWebContents() {
+ return NULL;
}
void SampleActivity::Init() {
« no previous file with comments | « athena/test/sample_activity.h ('k') | chrome/browser/ui/views/athena/DEPS » ('j') | chrome/browser/ui/views/athena/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698