| Index: athena/content/shell/shell_app_activity.cc
|
| diff --git a/athena/content/shell/shell_app_activity.cc b/athena/content/shell/shell_app_activity.cc
|
| index 77824f249219bab5d0914389f97a732b523e6e57..7e414e7ef59cdbb40d1d4ce7870b88b7f4ae74ce 100644
|
| --- a/athena/content/shell/shell_app_activity.cc
|
| +++ b/athena/content/shell/shell_app_activity.cc
|
| @@ -8,11 +8,13 @@
|
|
|
| namespace athena {
|
|
|
| -ShellAppActivity::ShellAppActivity(extensions::ShellAppWindow* app_window)
|
| - : shell_app_window_(app_window) {
|
| +ShellAppActivity::ShellAppActivity(extensions::ShellAppWindow* app_window,
|
| + const std::string& app_id)
|
| + : AppActivity(app_id), shell_app_window_(app_window) {
|
| }
|
|
|
| -ShellAppActivity::~ShellAppActivity() {}
|
| +ShellAppActivity::~ShellAppActivity() {
|
| +}
|
|
|
| content::WebContents* ShellAppActivity::GetWebContents() {
|
| return shell_app_window_->GetAssociatedWebContents();
|
|
|