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/public/content_activity_factory.h" | 5 #include "athena/content/content_activity_factory.h" |
6 | 6 |
7 #include "athena/content/app_activity.h" | |
8 #include "athena/content/web_activity.h" | 7 #include "athena/content/web_activity.h" |
9 #include "base/logging.h" | 8 #include "base/logging.h" |
10 | 9 |
11 namespace athena { | 10 namespace athena { |
12 | 11 |
13 ContentActivityFactory::ContentActivityFactory() { | 12 ContentActivityFactory::ContentActivityFactory() { |
14 } | 13 } |
15 | 14 |
16 ContentActivityFactory::~ContentActivityFactory() {} | 15 ContentActivityFactory::~ContentActivityFactory() {} |
17 | 16 |
18 Activity* ContentActivityFactory::CreateWebActivity( | 17 Activity* ContentActivityFactory::CreateWebActivity( |
19 content::BrowserContext* browser_context, | 18 content::BrowserContext* browser_context, |
20 const GURL& url) { | 19 const GURL& url) { |
21 return new WebActivity(browser_context, url); | 20 return new WebActivity(browser_context, url); |
22 } | 21 } |
23 | 22 |
24 Activity* ContentActivityFactory::CreateAppActivity( | 23 ActivityFactory* CreateContentActivityFactory() { |
25 extensions::ShellAppWindow* app_window) { | 24 return new ContentActivityFactory(); |
26 return new AppActivity(app_window); | |
27 } | 25 } |
28 | 26 |
29 } // namespace athena | 27 } // namespace athena |
OLD | NEW |