OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "athena/test/sample_activity_factory.h" | 5 #include "athena/test/sample_activity_factory.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "athena/test/sample_activity.h" | 9 #include "athena/test/sample_activity.h" |
10 #include "third_party/skia/include/core/SkColor.h" | 10 #include "third_party/skia/include/core/SkColor.h" |
11 #include "url/gurl.h" | 11 #include "url/gurl.h" |
12 | 12 |
13 namespace athena { | 13 namespace athena { |
14 namespace test { | 14 namespace test { |
15 | 15 |
16 namespace { | 16 namespace { |
17 const SkColor kDefaultColor = SK_ColorRED; | 17 const SkColor kDefaultColor = SK_ColorRED; |
18 const SkColor kDefaultContentColor = SK_ColorGREEN; | 18 const SkColor kDefaultContentColor = SK_ColorGREEN; |
19 } | 19 } |
20 | 20 |
21 SampleActivityFactory::SampleActivityFactory() {} | 21 SampleActivityFactory::SampleActivityFactory() {} |
22 | 22 |
23 SampleActivityFactory::~SampleActivityFactory() {} | 23 SampleActivityFactory::~SampleActivityFactory() {} |
24 | 24 |
25 Activity* SampleActivityFactory::CreateWebActivity( | 25 Activity* SampleActivityFactory::CreateWebActivity( |
26 content::BrowserContext* browser_context, | 26 content::BrowserContext* browser_context, |
27 const GURL& url) { | 27 const GURL& url) { |
28 return CreateAppActivity(browser_context, url.spec()); | |
29 } | |
30 | |
31 Activity* SampleActivityFactory::CreateAppActivity( | |
32 content::BrowserContext* browser_context, | |
33 const std::string& app_id) { | |
28 return new SampleActivity( | 34 return new SampleActivity( |
29 kDefaultColor, kDefaultContentColor, url.spec()); | 35 kDefaultColor, kDefaultContentColor, app_id); |
oshima
2014/06/06 23:39:00
maybe different colors?
Jun Mukai
2014/06/09 20:33:13
Done.
| |
30 } | 36 } |
31 | 37 |
32 } // namespace test | 38 } // namespace test |
33 } // namespace athena | 39 } // namespace athena |
OLD | NEW |