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/content_activity_factory.h" | 5 #include "athena/content/content_activity_factory.h" |
6 | 6 |
7 #include "athena/content/shell/shell_app_activity.h" | 7 #include "athena/content/shell/shell_app_activity.h" |
8 | 8 |
9 namespace athena { | 9 namespace athena { |
10 | 10 |
11 Activity* ContentActivityFactory::CreateAppActivity( | 11 Activity* ContentActivityFactory::CreateAppActivity( |
12 extensions::ShellAppWindow* app_window, | 12 extensions::ShellAppWindow* app_window, |
13 const std::string& app_id) { | 13 const std::string& app_id) { |
14 return new ShellAppActivity(app_window, app_id); | 14 return new ShellAppActivity(app_window, app_id); |
15 } | 15 } |
16 | 16 |
17 Activity* ContentActivityFactory::CreateAppActivity( | 17 Activity* ContentActivityFactory::CreateAppActivity( |
18 apps::AppWindow* app_window) { | 18 extensions::AppWindow* app_window) { |
19 return NULL; | 19 return NULL; |
20 } | 20 } |
21 | 21 |
22 } // namespace athena | 22 } // namespace athena |
OLD | NEW |