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

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

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 | « athena/content/content_activity_factory.h ('k') | athena/test/sample_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 #include "athena/content/content_activity_factory.h" 5 #include "athena/content/content_activity_factory.h"
6 6
7 #include "athena/content/shell/shell_app_activity.h" 7 #include "athena/content/shell/shell_app_activity.h"
8 8
9 namespace athena { 9 namespace athena {
10 10
11 Activity* ContentActivityFactory::CreateAppActivity( 11 Activity* ContentActivityFactory::CreateAppActivity(
12 extensions::ShellAppWindow* app_window, 12 extensions::ShellAppWindow* app_window,
13 const std::string& app_id) { 13 const std::string& app_id) {
14 return new ShellAppActivity(app_window, app_id); 14 return new ShellAppActivity(app_window, app_id);
15 } 15 }
16 16
17 Activity* ContentActivityFactory::CreateAppActivity( 17 Activity* ContentActivityFactory::CreateAppActivity(
18 apps::AppWindow* app_window) { 18 extensions::AppWindow* app_window) {
19 return NULL; 19 return NULL;
20 } 20 }
21 21
22 } // namespace athena 22 } // namespace athena
OLDNEW
« no previous file with comments | « athena/content/content_activity_factory.h ('k') | athena/test/sample_activity_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698