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

Side by Side Diff: athena/content/content_activity_factory.h

Issue 571643003: Remove app_shell chrome.shell API and ShellAppWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (remove-shell) rebase 2 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/content_activity_factory.cc ('k') | athena/content/shell/DEPS » ('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 #ifndef ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_ 5 #ifndef ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_
6 #define ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_ 6 #define ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_
7 7
8 #include "athena/activity/public/activity_factory.h" 8 #include "athena/activity/public/activity_factory.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 10
11 namespace athena { 11 namespace athena {
12 12
13 class ContentActivityFactory : public ActivityFactory { 13 class ContentActivityFactory : public ActivityFactory {
14 public: 14 public:
15 ContentActivityFactory(); 15 ContentActivityFactory();
16 virtual ~ContentActivityFactory(); 16 virtual ~ContentActivityFactory();
17 17
18 // Overridden from ActivityFactory: 18 // Overridden from ActivityFactory:
19 virtual Activity* CreateWebActivity(content::BrowserContext* browser_context, 19 virtual Activity* CreateWebActivity(content::BrowserContext* browser_context,
20 const base::string16& title, 20 const base::string16& title,
21 const GURL& url) OVERRIDE; 21 const GURL& url) OVERRIDE;
22 virtual Activity* CreateAppActivity(extensions::ShellAppWindow* app_window,
23 const std::string& app_id) OVERRIDE;
24 virtual Activity* CreateAppActivity(extensions::AppWindow* app_window, 22 virtual Activity* CreateAppActivity(extensions::AppWindow* app_window,
25 views::WebView* web_view) OVERRIDE; 23 views::WebView* web_view) OVERRIDE;
26 24
27 private: 25 private:
28 DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory); 26 DISALLOW_COPY_AND_ASSIGN(ContentActivityFactory);
29 }; 27 };
30 28
31 } // namespace athena 29 } // namespace athena
32 30
33 #endif // ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_ 31 #endif // ATHENA_CONTENT_CONTENT_ACTIVITY_FACTORY_H_
OLDNEW
« no previous file with comments | « athena/content/chrome/content_activity_factory.cc ('k') | athena/content/shell/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698