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

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

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded include in chrome_shell_delegate.cc 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 | Annotate | Revision Log
« no previous file with comments | « athena/test/sample_activity_factory.h ('k') | chrome/browser/app_controller_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 26 matching lines...) Expand all
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
OLDNEW
« no previous file with comments | « athena/test/sample_activity_factory.h ('k') | chrome/browser/app_controller_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698