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/activity/public/activity_factory.h" | 5 #include "athena/activity/public/activity_factory.h" |
6 #include "athena/activity/public/activity_manager.h" | 6 #include "athena/activity/public/activity_manager.h" |
7 #include "athena/content/public/web_contents_view_delegate_creator.h" | 7 #include "athena/content/public/web_contents_view_delegate_creator.h" |
8 #include "athena/env/public/athena_env.h" | 8 #include "athena/env/public/athena_env.h" |
9 #include "athena/extensions/public/extensions_delegate.h" | 9 #include "athena/extensions/public/extensions_delegate.h" |
10 #include "athena/main/athena_content_client.h" | 10 #include "athena/main/athena_content_client.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 return athena::AthenaEnv::Get()->GetHost(); | 54 return athena::AthenaEnv::Get()->GetHost(); |
55 } | 55 } |
56 | 56 |
57 // Creates a new app window and adds it to the desktop. The desktop maintains | 57 // Creates a new app window and adds it to the desktop. The desktop maintains |
58 // ownership of the window. | 58 // ownership of the window. |
59 // TODO(jamescook|oshima): Is this function needed? | 59 // TODO(jamescook|oshima): Is this function needed? |
60 virtual extensions::AppWindow* CreateAppWindow( | 60 virtual extensions::AppWindow* CreateAppWindow( |
61 content::BrowserContext* context, | 61 content::BrowserContext* context, |
62 const extensions::Extension* extension) override { | 62 const extensions::Extension* extension) override { |
63 NOTIMPLEMENTED(); | 63 NOTIMPLEMENTED(); |
64 return NULL; | 64 return nullptr; |
65 } | 65 } |
66 | 66 |
67 // Adds the window to the desktop. | 67 // Adds the window to the desktop. |
68 virtual void AddAppWindow(aura::Window* window) override { | 68 virtual void AddAppWindow(aura::Window* window) override { |
69 NOTIMPLEMENTED(); | 69 NOTIMPLEMENTED(); |
70 } | 70 } |
71 | 71 |
72 // Closes and destroys the app windows. | 72 // Closes and destroys the app windows. |
73 virtual void CloseAppWindows() override {} | 73 virtual void CloseAppWindows() override {} |
74 | 74 |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 | 190 |
191 int main(int argc, const char** argv) { | 191 int main(int argc, const char** argv) { |
192 AthenaMainDelegate delegate; | 192 AthenaMainDelegate delegate; |
193 content::ContentMainParams params(&delegate); | 193 content::ContentMainParams params(&delegate); |
194 | 194 |
195 params.argc = argc; | 195 params.argc = argc; |
196 params.argv = argv; | 196 params.argv = argv; |
197 | 197 |
198 return content::ContentMain(params); | 198 return content::ContentMain(params); |
199 } | 199 } |
OLD | NEW |