Chromium Code Reviews| Index: athena/main/athena_main.cc |
| diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc |
| index 3c66f18d2fa2e79c93af93ae7578f7441922e0c1..adb894a7ee4548e9e10af58bf5d1ba3c8e698997 100644 |
| --- a/athena/main/athena_main.cc |
| +++ b/athena/main/athena_main.cc |
| @@ -51,9 +51,9 @@ class AthenaDesktopController : public extensions::DesktopController { |
| return athena::AthenaEnv::Get()->GetHost(); |
| } |
| - // Creates a new app window and adds it to the desktop. The desktop maintains |
| - // ownership of the window. |
| - virtual extensions::ShellAppWindow* CreateAppWindow( |
| + // Creates a new ShellAppWindow and adds it to the desktop. The desktop |
| + // maintains ownership of the window. |
| + virtual extensions::ShellAppWindow* CreateShellAppWindow( |
| content::BrowserContext* context, |
| const extensions::Extension* extension) OVERRIDE { |
| extensions::ShellAppWindow* app_window = new extensions::ShellAppWindow(); |
| @@ -64,6 +64,15 @@ class AthenaDesktopController : public extensions::DesktopController { |
| return app_window; |
| } |
| + // Creates a new app window and adds it to the desktop. The desktop maintains |
|
James Cook
2014/09/08 18:14:31
The desktop maintains ownership? I thought it had
|
| + // ownership of the window. |
| + virtual extensions::AppWindow* CreateAppWindow( |
| + content::BrowserContext* context, |
| + const extensions::Extension* extension) OVERRIDE { |
| + NOTIMPLEMENTED(); |
| + return NULL; |
| + } |
| + |
| // Adds the window to the desktop. |
| virtual void AddAppWindow(aura::Window* window) OVERRIDE { |
| NOTIMPLEMENTED(); |