diff options
| author | oshima <oshima@chromium.org> | 2014-09-24 19:15:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-25 02:15:53 +0000 |
| commit | b79e7fadbdb6fd5dba5049dda6aeb0863a44d18a (patch) | |
| tree | 3438adaa5dc0e2564fa510854acee2949a1d155c /athena/content/app_activity_proxy.cc | |
| parent | 14e5bdf573d0621dfdd553888a5d3c557fb699a0 (diff) | |
| download | chromium_src-b79e7fadbdb6fd5dba5049dda6aeb0863a44d18a.zip chromium_src-b79e7fadbdb6fd5dba5049dda6aeb0863a44d18a.tar.gz chromium_src-b79e7fadbdb6fd5dba5049dda6aeb0863a44d18a.tar.bz2 | |
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}
Diffstat (limited to 'athena/content/app_activity_proxy.cc')
| -rw-r--r-- | athena/content/app_activity_proxy.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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. |