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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/test/sample_activity_factory.cc

Issue 311113005: AppModelBuilder to athena. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« athena/content/content_app_model_builder.cc ('K') | « athena/test/sample_activity_factory.h ('k') | athena/test/test_app_model_builder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/test/sample_activity_factory.cc
diff --git a/athena/test/sample_activity_factory.cc b/athena/test/sample_activity_factory.cc
index af2d1477766dc9727d61c8bfcc2a6903e5efeeed..4c46f269c38d92169a21aec67b2732d5696ed07e 100644
--- a/athena/test/sample_activity_factory.cc
+++ b/athena/test/sample_activity_factory.cc
@@ -25,8 +25,14 @@ SampleActivityFactory::~SampleActivityFactory() {}
Activity* SampleActivityFactory::CreateWebActivity(
content::BrowserContext* browser_context,
const GURL& url) {
+ return CreateAppActivity(browser_context, url.spec());
+}
+
+Activity* SampleActivityFactory::CreateAppActivity(
+ content::BrowserContext* browser_context,
+ const std::string& app_id) {
return new SampleActivity(
- kDefaultColor, kDefaultContentColor, url.spec());
+ kDefaultColor, kDefaultContentColor, app_id);
oshima 2014/06/06 23:39:00 maybe different colors?
Jun Mukai 2014/06/09 20:33:13 Done.
}
} // namespace test
« athena/content/content_app_model_builder.cc ('K') | « athena/test/sample_activity_factory.h ('k') | athena/test/test_app_model_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698