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/logging.h" | 10 #include "base/logging.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 } | 35 } |
36 | 36 |
37 Activity* SampleActivityFactory::CreateAppActivity( | 37 Activity* SampleActivityFactory::CreateAppActivity( |
38 extensions::ShellAppWindow* app_window) { | 38 extensions::ShellAppWindow* app_window) { |
39 // SampleActivityFactory can't own the |app_window|, so it must be NULL. | 39 // SampleActivityFactory can't own the |app_window|, so it must be NULL. |
40 DCHECK(app_window == NULL); | 40 DCHECK(app_window == NULL); |
41 return new SampleActivity( | 41 return new SampleActivity( |
42 kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App")); | 42 kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App")); |
43 } | 43 } |
44 | 44 |
| 45 Activity* SampleActivityFactory::CreateAppActivity( |
| 46 apps::AppWindow* app_window) { |
| 47 return new SampleActivity( |
| 48 kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App")); |
| 49 } |
| 50 |
45 } // namespace test | 51 } // namespace test |
46 } // namespace athena | 52 } // namespace athena |
OLD | NEW |