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