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

Side by Side Diff: athena/content/content_activity_factory.cc

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/app_activity.cc ('k') | athena/content/content_app_model_builder.cc » ('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 #include "athena/content/public/content_activity_factory.h" 5 #include "athena/content/public/content_activity_factory.h"
6 6
7 #include "athena/content/app_activity.h" 7 #include "athena/content/app_activity.h"
8 #include "athena/content/web_activity.h" 8 #include "athena/content/web_activity.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 10
11 namespace athena { 11 namespace athena {
12 12
13 ContentActivityFactory::ContentActivityFactory() { 13 ContentActivityFactory::ContentActivityFactory() {
14 } 14 }
15 15
16 ContentActivityFactory::~ContentActivityFactory() {} 16 ContentActivityFactory::~ContentActivityFactory() {}
17 17
18 Activity* ContentActivityFactory::CreateWebActivity( 18 Activity* ContentActivityFactory::CreateWebActivity(
19 content::BrowserContext* browser_context, 19 content::BrowserContext* browser_context,
20 const GURL& url) { 20 const GURL& url) {
21 return new WebActivity(browser_context, url); 21 return new WebActivity(browser_context, url);
22 } 22 }
23 23
24 Activity* ContentActivityFactory::CreateAppActivity( 24 Activity* ContentActivityFactory::CreateAppActivity(
25 apps::ShellAppWindow* app_window) { 25 extensions::ShellAppWindow* app_window) {
26 return new AppActivity(app_window); 26 return new AppActivity(app_window);
27 } 27 }
28 28
29 } // namespace athena 29 } // namespace athena
OLDNEW
« no previous file with comments | « athena/content/app_activity.cc ('k') | athena/content/content_app_model_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698