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

Side by Side Diff: athena/activity/public/activity_factory.h

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded include in chrome_shell_delegate.cc 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 | Annotate | Revision Log
« no previous file with comments | « apps/ui/views/native_app_window_views.cc ('k') | athena/content/content_activity_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_ 5 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_
6 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_ 6 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_
7 7
8 #include "athena/athena_export.h" 8 #include "athena/athena_export.h"
9 #include "url/gurl.h" 9 #include "url/gurl.h"
10 10
11 namespace apps {
12 class AppWindow;
13 }
14
15 namespace content { 11 namespace content {
16 class BrowserContext; 12 class BrowserContext;
17 } 13 }
18 14
19 namespace extensions { 15 namespace extensions {
16 class AppWindow;
20 class ShellAppWindow; 17 class ShellAppWindow;
21 } 18 }
22 19
23 namespace athena { 20 namespace athena {
24 class Activity; 21 class Activity;
25 22
26 class ATHENA_EXPORT ActivityFactory { 23 class ATHENA_EXPORT ActivityFactory {
27 public: 24 public:
28 // Registers the singleton factory. 25 // Registers the singleton factory.
29 static void RegisterActivityFactory(ActivityFactory* factory); 26 static void RegisterActivityFactory(ActivityFactory* factory);
(...skipping 11 matching lines...) Expand all
41 const GURL& url) = 0; 38 const GURL& url) = 0;
42 39
43 // Create an activity of an app with |app_window| for app shell environemnt. 40 // Create an activity of an app with |app_window| for app shell environemnt.
44 // The returned activity should own |app_window|. 41 // The returned activity should own |app_window|.
45 // TODO(oshima): Consolidate these two methods to create AppActivity 42 // TODO(oshima): Consolidate these two methods to create AppActivity
46 // once crbug.com/403726 is finished. 43 // once crbug.com/403726 is finished.
47 virtual Activity* CreateAppActivity(extensions::ShellAppWindow* app_window, 44 virtual Activity* CreateAppActivity(extensions::ShellAppWindow* app_window,
48 const std::string& id) = 0; 45 const std::string& id) = 0;
49 46
50 // Create an activity of an app with |app_window| for chrome environment. 47 // Create an activity of an app with |app_window| for chrome environment.
51 virtual Activity* CreateAppActivity(apps::AppWindow* app_window) = 0; 48 virtual Activity* CreateAppActivity(extensions::AppWindow* app_window) = 0;
52 }; 49 };
53 50
54 } // namespace athena 51 } // namespace athena
55 52
56 #endif // ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_ 53 #endif // ATHENA_ACTIVITY_PUBLIC_ACTIVITY_FACTORY_H_
OLDNEW
« no previous file with comments | « apps/ui/views/native_app_window_views.cc ('k') | athena/content/content_activity_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698