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 "base/strings/utf_string_conversions.h" |
10 #include "third_party/skia/include/core/SkColor.h" | 11 #include "third_party/skia/include/core/SkColor.h" |
11 #include "url/gurl.h" | 12 #include "url/gurl.h" |
12 | 13 |
13 namespace athena { | 14 namespace athena { |
14 namespace test { | 15 namespace test { |
15 | 16 |
16 namespace { | 17 namespace { |
17 const SkColor kDefaultColor = SK_ColorRED; | 18 const SkColor kDefaultColor = SK_ColorRED; |
18 const SkColor kDefaultContentColor = SK_ColorGREEN; | 19 const SkColor kDefaultContentColor = SK_ColorGREEN; |
19 } | 20 } |
20 | 21 |
21 SampleActivityFactory::SampleActivityFactory() {} | 22 SampleActivityFactory::SampleActivityFactory() {} |
22 | 23 |
23 SampleActivityFactory::~SampleActivityFactory() {} | 24 SampleActivityFactory::~SampleActivityFactory() {} |
24 | 25 |
25 Activity* SampleActivityFactory::CreateWebActivity( | 26 Activity* SampleActivityFactory::CreateWebActivity( |
26 content::BrowserContext* browser_context, | 27 content::BrowserContext* browser_context, |
27 const GURL& url) { | 28 const GURL& url) { |
28 return new SampleActivity( | 29 return new SampleActivity( |
29 kDefaultColor, kDefaultContentColor, url.spec()); | 30 kDefaultColor, kDefaultContentColor, base::UTF8ToUTF16(url.spec())); |
30 } | 31 } |
31 | 32 |
32 } // namespace test | 33 } // namespace test |
33 } // namespace athena | 34 } // namespace athena |
OLD | NEW |