Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: athena/test/sample_activity_factory.cc

Issue 544813002: Support V1 app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 11 matching lines...) Expand all
22 const SkColor kDefaultAppColor = SK_ColorYELLOW; 22 const SkColor kDefaultAppColor = SK_ColorYELLOW;
23 const SkColor kDefaultAppContentColor = SK_ColorBLUE; 23 const SkColor kDefaultAppContentColor = SK_ColorBLUE;
24 } 24 }
25 25
26 SampleActivityFactory::SampleActivityFactory() {} 26 SampleActivityFactory::SampleActivityFactory() {}
27 27
28 SampleActivityFactory::~SampleActivityFactory() {} 28 SampleActivityFactory::~SampleActivityFactory() {}
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 GURL& url) { 33 const GURL& url) {
33 return new SampleActivity( 34 return new SampleActivity(
34 kDefaultColor, kDefaultContentColor, base::UTF8ToUTF16(url.spec())); 35 kDefaultColor, kDefaultContentColor, base::UTF8ToUTF16(url.spec()));
35 } 36 }
36 37
37 Activity* SampleActivityFactory::CreateAppActivity( 38 Activity* SampleActivityFactory::CreateAppActivity(
38 extensions::ShellAppWindow* app_window, 39 extensions::ShellAppWindow* app_window,
39 const std::string& app_id) { 40 const std::string& app_id) {
40 // 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.
41 DCHECK(app_window == NULL); 42 DCHECK(app_window == NULL);
42 return new SampleActivity( 43 return new SampleActivity(
43 kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App")); 44 kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App"));
44 } 45 }
45 46
46 Activity* SampleActivityFactory::CreateAppActivity( 47 Activity* SampleActivityFactory::CreateAppActivity(
47 extensions::AppWindow* app_window) { 48 extensions::AppWindow* app_window) {
48 return new SampleActivity( 49 return new SampleActivity(
49 kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App")); 50 kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App"));
50 } 51 }
51 52
52 } // namespace test 53 } // namespace test
53 } // namespace athena 54 } // namespace athena
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698