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

Unified Diff: athena/test/sample_activity_factory.h

Issue 501093003: Consolidate AppControllDelegate to ExtensionsDelegate (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/main/athena_main.cc ('k') | athena/test/sample_activity_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/test/sample_activity_factory.h
diff --git a/athena/test/sample_activity_factory.h b/athena/test/sample_activity_factory.h
index 46d4b94a16954d30a9b00e067ad8a73508bcdc84..5dd9e1ad552bc2b21daa7d089e43ea14ce990955 100644
--- a/athena/test/sample_activity_factory.h
+++ b/athena/test/sample_activity_factory.h
@@ -19,10 +19,9 @@ class SampleActivityFactory : public ActivityFactory {
// Overridden from ActivityFactory:
virtual Activity* CreateWebActivity(content::BrowserContext* browser_context,
const GURL& url) OVERRIDE;
- virtual Activity* CreateAppActivity(
- extensions::ShellAppWindow* app_window) OVERRIDE;
- virtual Activity* CreateAppActivity(
- apps::AppWindow* app_window) OVERRIDE;
+ virtual Activity* CreateAppActivity(extensions::ShellAppWindow* app_window,
+ const std::string& app_id) OVERRIDE;
+ virtual Activity* CreateAppActivity(apps::AppWindow* app_window) OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(SampleActivityFactory);
« no previous file with comments | « athena/main/athena_main.cc ('k') | athena/test/sample_activity_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698