From b79e7fadbdb6fd5dba5049dda6aeb0863a44d18a Mon Sep 17 00:00:00 2001
From: oshima <oshima@chromium.org>
Date: Wed, 24 Sep 2014 19:15:37 -0700
Subject: Get FileSelect dialog work on athena

Introduced c/b/ui/views/athena/athena_util so that
arbitrary code under chrome/browser doesn't have to depend on athena/

BUG=414340,410499

Review URL: https://codereview.chromium.org/603033002

Cr-Commit-Position: refs/heads/master@{#296628}
---
 athena/content/app_activity_proxy.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'athena/content/app_activity_proxy.cc')

diff --git a/athena/content/app_activity_proxy.cc b/athena/content/app_activity_proxy.cc
index e4efd89..87d98ae 100644
--- a/athena/content/app_activity_proxy.cc
+++ b/athena/content/app_activity_proxy.cc
@@ -57,6 +57,10 @@ aura::Window* AppActivityProxy::GetWindow() {
   return view_->GetWidget()->GetNativeWindow();
 }
 
+content::WebContents* AppActivityProxy::GetWebContents() {
+  return NULL;
+}
+
 void AppActivityProxy::Init() {
   DCHECK(replaced_activity_);
   // Get the content proxy to present the content.
-- 
cgit v1.1