diff options
| author | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
| commit | 1320f92c476a1ad9d19dba2a48c72b75566198e9 (patch) | |
| tree | ea7f149ccad687b22c18a72b729646568b2d54fb /athena/test/sample_activity_factory.h | |
| parent | 39b78c562f50ad7d5551ee861121f899239525a2 (diff) | |
| download | chromium_org-1320f92c476a1ad9d19dba2a48c72b75566198e9.tar.gz | |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
Diffstat (limited to 'athena/test/sample_activity_factory.h')
| -rw-r--r-- | athena/test/sample_activity_factory.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/athena/test/sample_activity_factory.h b/athena/test/sample_activity_factory.h index df89a72c97..819d9cc2b0 100644 --- a/athena/test/sample_activity_factory.h +++ b/athena/test/sample_activity_factory.h @@ -18,9 +18,10 @@ class SampleActivityFactory : public ActivityFactory { // Overridden from ActivityFactory: virtual Activity* CreateWebActivity(content::BrowserContext* browser_context, + const base::string16& title, const GURL& url) OVERRIDE; - virtual Activity* CreateAppActivity( - extensions::ShellAppWindow* app_window) OVERRIDE; + virtual Activity* CreateAppActivity(extensions::AppWindow* app_window, + views::WebView* web_view) OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(SampleActivityFactory); |