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