| 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 #ifndef ATHENA_MAIN_ATHENA_APP_WINDOW_CONTROLLER_H_ | 5 #ifndef ATHENA_MAIN_ATHENA_APP_WINDOW_CONTROLLER_H_ |
| 6 #define ATHENA_MAIN_ATHENA_APP_WINDOW_CONTROLLER_H_ | 6 #define ATHENA_MAIN_ATHENA_APP_WINDOW_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include "apps/shell/browser/shell_app_window_controller.h" | |
| 9 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "extensions/shell/browser/shell_app_window_controller.h" |
| 10 | 10 |
| 11 namespace athena { | 11 namespace athena { |
| 12 | 12 |
| 13 // The shell app window controller for athena. It embeds the web_contents of | 13 // The shell app window controller for athena. It embeds the web_contents of |
| 14 // an app window into an Athena activity. | 14 // an app window into an Athena activity. |
| 15 class AthenaAppWindowController : public apps::ShellAppWindowController { | 15 class AthenaAppWindowController : public extensions::ShellAppWindowController { |
| 16 public: | 16 public: |
| 17 AthenaAppWindowController(); | 17 AthenaAppWindowController(); |
| 18 virtual ~AthenaAppWindowController(); | 18 virtual ~AthenaAppWindowController(); |
| 19 | 19 |
| 20 // Overridden from apps::ShellAppWindowController: | 20 // Overridden from extensions::ShellAppWindowController: |
| 21 virtual apps::ShellAppWindow* CreateAppWindow( | 21 virtual extensions::ShellAppWindow* CreateAppWindow( |
| 22 content::BrowserContext* context) OVERRIDE; | 22 content::BrowserContext* context) OVERRIDE; |
| 23 virtual void CloseAppWindows() OVERRIDE; | 23 virtual void CloseAppWindows() OVERRIDE; |
| 24 | 24 |
| 25 private: | 25 private: |
| 26 DISALLOW_COPY_AND_ASSIGN(AthenaAppWindowController); | 26 DISALLOW_COPY_AND_ASSIGN(AthenaAppWindowController); |
| 27 }; | 27 }; |
| 28 | 28 |
| 29 } // namespace athena | 29 } // namespace athena |
| 30 | 30 |
| 31 #endif // ATHENA_MAIN_ATHENA_APP_WINDOW_CONTROLLER_H_ | 31 #endif // ATHENA_MAIN_ATHENA_APP_WINDOW_CONTROLLER_H_ |
| OLD | NEW |