diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 20:07:13 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 20:07:13 +0000 |
| commit | 33fda21dab63ec8ad43c65332c6a4beeace51395 (patch) | |
| tree | ac4a77705f9a5696c6e4cfce7146b6cb97cf934f /athena/content/public/content_activity_factory.h | |
| parent | 210b95666a12f3eb7224cec489d775a13229e882 (diff) | |
| download | chromium_src-33fda21dab63ec8ad43c65332c6a4beeace51395.zip chromium_src-33fda21dab63ec8ad43c65332c6a4beeace51395.tar.gz chromium_src-33fda21dab63ec8ad43c65332c6a4beeace51395.tar.bz2 | |
Introduces AppActivity and handler of chrome.shell API.
Now, clicking the app item just emits onLaunched event, and the
app will create an app window on the event handler. The API handler
creates a ShellAppWindow for app_shell, but it should create
an activity on athena.
BUG=380421
R=jamescook@chromium.org, oshima@chromium.org
TEST=manually
Review URL: https://codereview.chromium.org/335003003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena/content/public/content_activity_factory.h')
| -rw-r--r-- | athena/content/public/content_activity_factory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/athena/content/public/content_activity_factory.h b/athena/content/public/content_activity_factory.h index 70e5ec4..2698123 100644 --- a/athena/content/public/content_activity_factory.h +++ b/athena/content/public/content_activity_factory.h @@ -19,8 +19,8 @@ class ATHENA_EXPORT ContentActivityFactory : public ActivityFactory { // Overridden from ActivityFactory: virtual Activity* CreateWebActivity(content::BrowserContext* browser_context, const GURL& url) OVERRIDE; - virtual Activity* CreateAppActivity(content::BrowserContext* browser_context, - const std::string& app_id) OVERRIDE; + virtual Activity* CreateAppActivity( + apps::ShellAppWindow* app_window) OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory); |