| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "athena/content/shell/shell_app_activity.h" | 5 #include "athena/content/shell/shell_app_activity.h" |
| 6 | 6 |
| 7 #include "extensions/shell/browser/shell_app_window.h" | 7 #include "extensions/shell/browser/shell_app_window.h" |
| 8 | 8 |
| 9 namespace athena { | 9 namespace athena { |
| 10 | 10 |
| 11 ShellAppActivity::ShellAppActivity(extensions::ShellAppWindow* app_window) | 11 ShellAppActivity::ShellAppActivity(extensions::ShellAppWindow* app_window, |
| 12 : shell_app_window_(app_window) { | 12 const std::string& app_id) |
| 13 : AppActivity(app_id), shell_app_window_(app_window) { |
| 13 } | 14 } |
| 14 | 15 |
| 15 ShellAppActivity::~ShellAppActivity() {} | 16 ShellAppActivity::~ShellAppActivity() { |
| 17 } |
| 16 | 18 |
| 17 content::WebContents* ShellAppActivity::GetWebContents() { | 19 content::WebContents* ShellAppActivity::GetWebContents() { |
| 18 return shell_app_window_->GetAssociatedWebContents(); | 20 return shell_app_window_->GetAssociatedWebContents(); |
| 19 } | 21 } |
| 20 | 22 |
| 21 } // namespace athena | 23 } // namespace athena |
| OLD | NEW |