Updating trunk VERSION from 2139.0 to 2140.0
[chromium-blink-merge.git] / athena / content / shell / content_activity_factory.cc
blob538ca268b0a85cfe7b091a33a2036a297c3cbdd9
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
3 // found in the LICENSE file.
5 #include "athena/content/content_activity_factory.h"
7 #include "athena/content/shell/shell_app_activity.h"
9 namespace athena {
11 Activity* ContentActivityFactory::CreateAppActivity(
12 extensions::ShellAppWindow* app_window,
13 const std::string& app_id) {
14 return new ShellAppActivity(app_window, app_id);
17 Activity* ContentActivityFactory::CreateAppActivity(
18 apps::AppWindow* app_window) {
19 return NULL;
22 } // namespace athena