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

Side by Side Diff: athena/content/shell/shell_app_activity.h

Issue 501093003: Consolidate AppControllDelegate to ExtensionsDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 ShellAppWindow; 13 class ShellAppWindow;
14 } 14 }
15 15
16 namespace athena { 16 namespace athena {
17 17
18 class ShellAppActivity : public AppActivity { 18 class ShellAppActivity : public AppActivity {
19 public: 19 public:
20 explicit ShellAppActivity(extensions::ShellAppWindow* app_window); 20 ShellAppActivity(extensions::ShellAppWindow* app_window,
21 const std::string& app_id);
21 virtual ~ShellAppActivity(); 22 virtual ~ShellAppActivity();
22 23
23 private: 24 private:
24 // AppActivity: 25 // AppActivity:
25 virtual content::WebContents* GetWebContents() OVERRIDE; 26 virtual content::WebContents* GetWebContents() OVERRIDE;
26 27
27 scoped_ptr<extensions::ShellAppWindow> shell_app_window_; 28 scoped_ptr<extensions::ShellAppWindow> shell_app_window_;
28 29
29 DISALLOW_COPY_AND_ASSIGN(ShellAppActivity); 30 DISALLOW_COPY_AND_ASSIGN(ShellAppActivity);
30 }; 31 };
31 32
32 } // namespace athena 33 } // namespace athena
33 34
34 #endif // ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_ 35 #endif // ATHENA_CONTENT_SHELL_SHELL_APP_ACTIVITY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698