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

Unified Diff: athena/content/content_activity_factory.cc

Issue 505273002: Move app_shell specific impl from athena_lib to athena_shell_lib (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/content/content_activity_factory.h ('k') | athena/content/public/content_activity_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/content_activity_factory.cc
diff --git a/athena/content/content_activity_factory.cc b/athena/content/content_activity_factory.cc
index 65747dc4b020e8c8f86c418a71ebeb301d0f5bb4..0503c6068b02634019d8af474900589ff01bd815 100644
--- a/athena/content/content_activity_factory.cc
+++ b/athena/content/content_activity_factory.cc
@@ -2,9 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "athena/content/public/content_activity_factory.h"
+#include "athena/content/content_activity_factory.h"
-#include "athena/content/app_activity.h"
#include "athena/content/web_activity.h"
#include "base/logging.h"
@@ -21,9 +20,8 @@ Activity* ContentActivityFactory::CreateWebActivity(
return new WebActivity(browser_context, url);
}
-Activity* ContentActivityFactory::CreateAppActivity(
- extensions::ShellAppWindow* app_window) {
- return new AppActivity(app_window);
+ActivityFactory* CreateContentActivityFactory() {
+ return new ContentActivityFactory();
}
} // namespace athena
« no previous file with comments | « athena/content/content_activity_factory.h ('k') | athena/content/public/content_activity_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698