summaryrefslogtreecommitdiffstats
path: root/athena/content/shell/shell_app_activity.cc
diff options
context:
space:
mode:
authoroshima <oshima@chromium.org>2014-09-22 09:34:31 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-22 16:34:40 +0000
commit685ccea874df9b5f47665aac007bbc876d344938 (patch)
tree9e83cb57931913d1616931a692ff6e7f4e917c1f /athena/content/shell/shell_app_activity.cc
parent4fab8a0b3d7e2ae3db541795783b41911ad8c711 (diff)
downloadchromium_src-685ccea874df9b5f47665aac007bbc876d344938.zip
chromium_src-685ccea874df9b5f47665aac007bbc876d344938.tar.gz
chromium_src-685ccea874df9b5f47665aac007bbc876d344938.tar.bz2
As both now uses AppWindow
BUG=None TBR=yoz@chromium.org Review URL: https://codereview.chromium.org/587953002 Cr-Commit-Position: refs/heads/master@{#295986}
Diffstat (limited to 'athena/content/shell/shell_app_activity.cc')
-rw-r--r--athena/content/shell/shell_app_activity.cc36
1 files changed, 0 insertions, 36 deletions
diff --git a/athena/content/shell/shell_app_activity.cc b/athena/content/shell/shell_app_activity.cc
deleted file mode 100644
index cb008e0..0000000
--- a/athena/content/shell/shell_app_activity.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "athena/content/shell/shell_app_activity.h"
-
-#include "content/public/browser/web_contents.h"
-#include "extensions/browser/app_window/app_window.h"
-#include "extensions/browser/app_window/native_app_window.h"
-#include "ui/views/controls/webview/webview.h"
-
-namespace athena {
-
-ShellAppActivity::ShellAppActivity(extensions::AppWindow* app_window)
- : AppActivity(app_window->extension_id()), app_window_(app_window) {
- DCHECK(app_window_);
-}
-
-ShellAppActivity::~ShellAppActivity() {
- app_window_->GetBaseWindow()->Close(); // Deletes |app_window_|.
-}
-
-views::Widget* ShellAppActivity::CreateWidget() {
- return NULL; // Use default widget.
-}
-
-views::WebView* ShellAppActivity::GetWebView() {
- content::WebContents* web_contents = app_window_->web_contents();
- views::WebView* web_view =
- new views::WebView(web_contents->GetBrowserContext());
- web_view->SetWebContents(web_contents);
- Observe(web_contents);
- return web_view;
-}
-
-} // namespace athena