diff options
| author | Mitsuru Oshima <oshima@chromium.org> | 2014-09-23 13:18:10 -0700 |
|---|---|---|
| committer | Mitsuru Oshima <oshima@chromium.org> | 2014-09-23 20:18:49 +0000 |
| commit | 2903f33784712aa48e18006a6bca60dd284afd97 (patch) | |
| tree | d3c273f04c2a3dc12964c6e23f9bc19b07725d47 /athena/test | |
| parent | d84f4fc68ce38526ab417b3ad52aa76b102c421f (diff) | |
| download | chromium_src-2903f33784712aa48e18006a6bca60dd284afd97.zip chromium_src-2903f33784712aa48e18006a6bca60dd284afd97.tar.gz chromium_src-2903f33784712aa48e18006a6bca60dd284afd97.tar.bz2 | |
Add actiivity in factory rather than each caller adds them.
BUG=None
R=sadrul@chromium.org
Review URL: https://codereview.chromium.org/596493002
Cr-Commit-Position: refs/heads/master@{#296213}
Diffstat (limited to 'athena/test')
| -rw-r--r-- | athena/test/sample_activity_factory.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/athena/test/sample_activity_factory.cc b/athena/test/sample_activity_factory.cc index d7444eb..87bef8c 100644 --- a/athena/test/sample_activity_factory.cc +++ b/athena/test/sample_activity_factory.cc @@ -6,6 +6,7 @@ #include <string> +#include "athena/activity/public/activity_manager.h" #include "athena/test/sample_activity.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" @@ -31,16 +32,20 @@ Activity* SampleActivityFactory::CreateWebActivity( content::BrowserContext* browser_context, const base::string16& title, const GURL& url) { - return new SampleActivity( + Activity* activity = new SampleActivity( kDefaultColor, kDefaultContentColor, base::UTF8ToUTF16(url.spec())); + ActivityManager::Get()->AddActivity(activity); + return activity; } Activity* SampleActivityFactory::CreateAppActivity( extensions::AppWindow* app_window, views::WebView* web_view) { DCHECK(!web_view); - return new SampleActivity( + Activity* activity = new SampleActivity( kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App")); + ActivityManager::Get()->AddActivity(activity); + return activity; } } // namespace test |