diff options
| author | oshima <oshima@chromium.org> | 2014-08-27 16:34:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 23:35:33 +0000 |
| commit | 07f5926458490eab81d5d71b88ef18a9b9948ea6 (patch) | |
| tree | 6789ec98908282685203e3d5346d2b2c3cfe9aea /athena/test | |
| parent | 86c315c379bfeefe3dd833cee678a41ac6884a74 (diff) | |
| download | chromium_src-07f5926458490eab81d5d71b88ef18a9b9948ea6.zip chromium_src-07f5926458490eab81d5d71b88ef18a9b9948ea6.tar.gz chromium_src-07f5926458490eab81d5d71b88ef18a9b9948ea6.tar.bz2 | |
Consolidate AppControllDelegate to ExtensionsDelegate.
* Prep for athena on chrome.
Another notable change:
* pass app_id to AppActivity. it's known at creation time.
Note: this depends on https://codereview.chromium.org/505273002/
BUG=397167
Review URL: https://codereview.chromium.org/501093003
Cr-Commit-Position: refs/heads/master@{#292264}
Diffstat (limited to 'athena/test')
| -rw-r--r-- | athena/test/sample_activity_factory.cc | 3 | ||||
| -rw-r--r-- | athena/test/sample_activity_factory.h | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/athena/test/sample_activity_factory.cc b/athena/test/sample_activity_factory.cc index 71ffef5..b043e17 100644 --- a/athena/test/sample_activity_factory.cc +++ b/athena/test/sample_activity_factory.cc @@ -35,7 +35,8 @@ Activity* SampleActivityFactory::CreateWebActivity( } Activity* SampleActivityFactory::CreateAppActivity( - extensions::ShellAppWindow* app_window) { + extensions::ShellAppWindow* app_window, + const std::string& app_id) { // SampleActivityFactory can't own the |app_window|, so it must be NULL. DCHECK(app_window == NULL); return new SampleActivity( diff --git a/athena/test/sample_activity_factory.h b/athena/test/sample_activity_factory.h index 46d4b94..5dd9e1a 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); |