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

Side by Side Diff: athena/content/public/content_activity_factory.h

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 40% Created 6 years, 5 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 | « athena/content/content_app_model_builder.cc ('k') | athena/main/DEPS » ('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_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_ 5 #ifndef ATHENA_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_
6 #define ATHENA_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_ 6 #define ATHENA_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_
7 7
8 #include "athena/activity/public/activity_factory.h" 8 #include "athena/activity/public/activity_factory.h"
9 #include "athena/athena_export.h" 9 #include "athena/athena_export.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 11
12 namespace athena { 12 namespace athena {
13 13
14 class ATHENA_EXPORT ContentActivityFactory : public ActivityFactory { 14 class ATHENA_EXPORT ContentActivityFactory : public ActivityFactory {
15 public: 15 public:
16 ContentActivityFactory(); 16 ContentActivityFactory();
17 virtual ~ContentActivityFactory(); 17 virtual ~ContentActivityFactory();
18 18
19 // Overridden from ActivityFactory: 19 // Overridden from ActivityFactory:
20 virtual Activity* CreateWebActivity(content::BrowserContext* browser_context, 20 virtual Activity* CreateWebActivity(content::BrowserContext* browser_context,
21 const GURL& url) OVERRIDE; 21 const GURL& url) OVERRIDE;
22 virtual Activity* CreateAppActivity( 22 virtual Activity* CreateAppActivity(
23 apps::ShellAppWindow* app_window) OVERRIDE; 23 extensions::ShellAppWindow* app_window) OVERRIDE;
24 24
25 private: 25 private:
26 DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory); 26 DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory);
27 }; 27 };
28 28
29 } // namespace athena 29 } // namespace athena
30 30
31 #endif // ATHENA_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_ 31 #endif // ATHENA_CONTENT_PUBLIC_CONTENT_ACTIVITY_FACTORY_H_
OLDNEW
« no previous file with comments | « athena/content/content_app_model_builder.cc ('k') | athena/main/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698