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/main/athena_app_window_controller.h" | 5 #include "athena/main/athena_app_window_controller.h" |
6 | 6 |
7 #include "apps/shell/browser/shell_app_window.h" | |
8 #include "athena/activity/public/activity_factory.h" | 7 #include "athena/activity/public/activity_factory.h" |
9 #include "athena/activity/public/activity_manager.h" | 8 #include "athena/activity/public/activity_manager.h" |
10 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
11 #include "content/public/browser/web_contents_observer.h" | 10 #include "content/public/browser/web_contents_observer.h" |
| 11 #include "extensions/shell/browser/shell_app_window.h" |
12 | 12 |
13 namespace athena { | 13 namespace athena { |
14 | 14 |
15 AthenaAppWindowController::AthenaAppWindowController() { | 15 AthenaAppWindowController::AthenaAppWindowController() { |
16 } | 16 } |
17 | 17 |
18 AthenaAppWindowController::~AthenaAppWindowController() { | 18 AthenaAppWindowController::~AthenaAppWindowController() { |
19 } | 19 } |
20 | 20 |
21 apps::ShellAppWindow* AthenaAppWindowController::CreateAppWindow( | 21 extensions::ShellAppWindow* AthenaAppWindowController::CreateAppWindow( |
22 content::BrowserContext* context) { | 22 content::BrowserContext* context) { |
23 apps::ShellAppWindow* app_window = new apps::ShellAppWindow(); | 23 extensions::ShellAppWindow* app_window = new extensions::ShellAppWindow(); |
24 app_window->Init(context, gfx::Size(100, 100)); | 24 app_window->Init(context, gfx::Size(100, 100)); |
25 ActivityManager::Get()->AddActivity(ActivityFactory::Get()->CreateAppActivity( | 25 ActivityManager::Get()->AddActivity(ActivityFactory::Get()->CreateAppActivity( |
26 app_window)); | 26 app_window)); |
27 return app_window; | 27 return app_window; |
28 } | 28 } |
29 | 29 |
30 void AthenaAppWindowController::CloseAppWindows() { | 30 void AthenaAppWindowController::CloseAppWindows() { |
31 // Do nothing. | 31 // Do nothing. |
32 } | 32 } |
33 | 33 |
34 } // namespace athena | 34 } // namespace athena |
OLD | NEW |