Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(325)

Side by Side Diff: athena/main/athena_main.cc

Issue 547593002: Add ShellAppsClient, ShellAppDelegate, ShellNativeAppWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apifeatures
Patch Set: Address comments Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 content::BrowserContext* context, 57 content::BrowserContext* context,
58 const extensions::Extension* extension) OVERRIDE { 58 const extensions::Extension* extension) OVERRIDE {
59 extensions::ShellAppWindow* app_window = new extensions::ShellAppWindow(); 59 extensions::ShellAppWindow* app_window = new extensions::ShellAppWindow();
60 app_window->Init(context, extension, gfx::Size(100, 100)); 60 app_window->Init(context, extension, gfx::Size(100, 100));
61 athena::ActivityManager::Get()->AddActivity( 61 athena::ActivityManager::Get()->AddActivity(
62 athena::ActivityFactory::Get()->CreateAppActivity(app_window, 62 athena::ActivityFactory::Get()->CreateAppActivity(app_window,
63 extension->id())); 63 extension->id()));
64 return app_window; 64 return app_window;
65 } 65 }
66 66
67 // Adds the window to the desktop.
68 void AddAppWindow(aura::Window* window) OVERRIDE {
69 NOTIMPLEMENTED();
70 }
71
67 // Closes and destroys the app windows. 72 // Closes and destroys the app windows.
68 virtual void CloseAppWindows() OVERRIDE {} 73 virtual void CloseAppWindows() OVERRIDE {}
69 74
70 DISALLOW_COPY_AND_ASSIGN(AthenaDesktopController); 75 DISALLOW_COPY_AND_ASSIGN(AthenaDesktopController);
71 }; 76 };
72 77
73 class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate { 78 class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate {
74 public: 79 public:
75 AthenaBrowserMainDelegate() {} 80 AthenaBrowserMainDelegate() {}
76 virtual ~AthenaBrowserMainDelegate() {} 81 virtual ~AthenaBrowserMainDelegate() {}
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 188
184 int main(int argc, const char** argv) { 189 int main(int argc, const char** argv) {
185 AthenaMainDelegate delegate; 190 AthenaMainDelegate delegate;
186 content::ContentMainParams params(&delegate); 191 content::ContentMainParams params(&delegate);
187 192
188 params.argc = argc; 193 params.argc = argc;
189 params.argv = argv; 194 params.argv = argv;
190 195
191 return content::ContentMain(params); 196 return content::ContentMain(params);
192 } 197 }
OLDNEW
« no previous file with comments | « no previous file | extensions/shell/app_shell.gyp » ('j') | extensions/shell/browser/desktop_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698