| 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 18 matching lines...) Expand all Loading... |
| 29 | 29 |
| 30 Activity* SampleActivityFactory::CreateWebActivity( | 30 Activity* SampleActivityFactory::CreateWebActivity( |
| 31 content::BrowserContext* browser_context, | 31 content::BrowserContext* browser_context, |
| 32 const base::string16& title, | 32 const base::string16& title, |
| 33 const GURL& url) { | 33 const GURL& url) { |
| 34 return new SampleActivity( | 34 return new SampleActivity( |
| 35 kDefaultColor, kDefaultContentColor, base::UTF8ToUTF16(url.spec())); | 35 kDefaultColor, kDefaultContentColor, base::UTF8ToUTF16(url.spec())); |
| 36 } | 36 } |
| 37 | 37 |
| 38 Activity* SampleActivityFactory::CreateAppActivity( | 38 Activity* SampleActivityFactory::CreateAppActivity( |
| 39 extensions::ShellAppWindow* app_window, | |
| 40 const std::string& app_id) { | |
| 41 // SampleActivityFactory can't own the |app_window|, so it must be NULL. | |
| 42 DCHECK(app_window == NULL); | |
| 43 return new SampleActivity( | |
| 44 kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App")); | |
| 45 } | |
| 46 | |
| 47 Activity* SampleActivityFactory::CreateAppActivity( | |
| 48 extensions::AppWindow* app_window, | 39 extensions::AppWindow* app_window, |
| 49 views::WebView* web_view) { | 40 views::WebView* web_view) { |
| 50 DCHECK(!web_view); | 41 DCHECK(!web_view); |
| 51 return new SampleActivity( | 42 return new SampleActivity( |
| 52 kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App")); | 43 kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App")); |
| 53 } | 44 } |
| 54 | 45 |
| 55 } // namespace test | 46 } // namespace test |
| 56 } // namespace athena | 47 } // namespace athena |
| OLD | NEW |