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/app_activity.h" | 7 #include "athena/content/app_activity.h" |
8 #include "extensions/browser/app_window/app_window.h" | 8 #include "extensions/browser/app_window/app_window.h" |
9 #include "ui/views/controls/webview/webview.h" | 9 #include "ui/views/controls/webview/webview.h" |
10 | 10 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 }; | 46 }; |
47 | 47 |
48 } // namespace | 48 } // namespace |
49 | 49 |
50 Activity* ContentActivityFactory::CreateAppActivity( | 50 Activity* ContentActivityFactory::CreateAppActivity( |
51 extensions::AppWindow* app_window, | 51 extensions::AppWindow* app_window, |
52 views::WebView* web_view) { | 52 views::WebView* web_view) { |
53 return new ChromeAppActivity(app_window, web_view); | 53 return new ChromeAppActivity(app_window, web_view); |
54 } | 54 } |
55 | 55 |
56 Activity* ContentActivityFactory::CreateAppActivity( | |
57 extensions::ShellAppWindow* app_window, | |
58 const std::string& app_id) { | |
59 return NULL; | |
60 } | |
61 | |
62 } // namespace athena | 56 } // namespace athena |
OLD | NEW |