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

Side by Side Diff: athena/content/shell/shell_app_activity.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
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_SHELL_SHELL_APP_ACTIVITY_H_ 5 #ifndef ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_
6 #define ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_ 6 #define ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_
7 7
8 #include "athena/content/app_activity.h" 8 #include "athena/content/app_activity.h"
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 11
12 namespace extensions { 12 namespace extensions {
13 class AppWindow; 13 class AppWindow;
14 class ShellAppWindow;
15 } 14 }
16 15
17 namespace athena { 16 namespace athena {
18 17
19 class ShellAppActivity : public AppActivity { 18 class ShellAppActivity : public AppActivity {
20 public: 19 public:
21 explicit ShellAppActivity(extensions::AppWindow* app_window); 20 explicit ShellAppActivity(extensions::AppWindow* app_window);
22 // TODO(hashimoto) Remove this.
23 ShellAppActivity(extensions::ShellAppWindow* app_window,
24 const std::string& app_id);
25 virtual ~ShellAppActivity(); 21 virtual ~ShellAppActivity();
26 22
27 private: 23 private:
28 // ActivityViewModel: 24 // ActivityViewModel:
29 virtual views::Widget* CreateWidget() OVERRIDE; 25 virtual views::Widget* CreateWidget() OVERRIDE;
30 26
31 // AppActivity: 27 // AppActivity:
32 virtual views::WebView* GetWebView() OVERRIDE; 28 virtual views::WebView* GetWebView() OVERRIDE;
33 29
34 extensions::AppWindow* app_window_; 30 extensions::AppWindow* app_window_;
35 scoped_ptr<extensions::ShellAppWindow> shell_app_window_;
36 31
37 DISALLOW_COPY_AND_ASSIGN(ShellAppActivity); 32 DISALLOW_COPY_AND_ASSIGN(ShellAppActivity);
38 }; 33 };
39 34
40 } // namespace athena 35 } // namespace athena
41 36
42 #endif // ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_ 37 #endif // ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_
OLDNEW
« no previous file with comments | « athena/content/shell/content_activity_factory.cc ('k') | athena/content/shell/shell_app_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698