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

Side by Side Diff: athena/content/chrome/content_activity_factory.cc

Issue 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments, 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
« no previous file with comments | « athena/content/chrome/DEPS ('k') | athena/extensions/chrome/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
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.
4
5 #include "athena/content/content_activity_factory.h"
6
7 #include "athena/content/app_activity.h"
8 #include "extensions/browser/app_window/app_window.h"
9
10 // TODO(oshima): Consolidate this and app shell implementation once
11 // crbug.com/403726 is fixed.
12 namespace athena {
13 namespace {
14
15 class ChromeAppActivity : public AppActivity {
16 public:
17 explicit ChromeAppActivity(extensions::AppWindow* app_window)
18 : AppActivity(app_window->extension_id()), app_window_(app_window) {}
19
20 private:
21 virtual ~ChromeAppActivity() {}
22
23 // AppActivity:
24 virtual content::WebContents* GetWebContents() OVERRIDE {
25 return app_window_->web_contents();
26 }
27
28 // Not owned.
29 extensions::AppWindow* app_window_;
30
31 DISALLOW_COPY_AND_ASSIGN(ChromeAppActivity);
32 };
33
34 } // namespace
35
36 Activity* ContentActivityFactory::CreateAppActivity(
37 extensions::AppWindow* app_window) {
38 return new ChromeAppActivity(app_window);
39 }
40
41 Activity* ContentActivityFactory::CreateAppActivity(
42 extensions::ShellAppWindow* app_window,
43 const std::string& app_id) {
44 return NULL;
45 }
46
47 } // namespace athena
OLDNEW
« no previous file with comments | « athena/content/chrome/DEPS ('k') | athena/extensions/chrome/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698