OLD | NEW |
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_PUBLIC_WEB_ACTIVITY_H_ | 5 #ifndef ATHENA_CONTENT_PUBLIC_WEB_ACTIVITY_H_ |
6 #define ATHENA_CONTENT_PUBLIC_WEB_ACTIVITY_H_ | 6 #define ATHENA_CONTENT_PUBLIC_WEB_ACTIVITY_H_ |
7 | 7 |
8 #include "athena/activity/public/activity.h" | 8 #include "athena/activity/public/activity.h" |
9 #include "athena/activity/public/activity_view_model.h" | 9 #include "athena/activity/public/activity_view_model.h" |
10 #include "content/public/browser/web_contents_observer.h" | 10 #include "content/public/browser/web_contents_observer.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 WebActivity(AthenaWebView* web_view); | 32 WebActivity(AthenaWebView* web_view); |
33 virtual ~WebActivity(); | 33 virtual ~WebActivity(); |
34 | 34 |
35 protected: | 35 protected: |
36 // Activity: | 36 // Activity: |
37 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE; | 37 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE; |
38 virtual void SetCurrentState(ActivityState state) OVERRIDE; | 38 virtual void SetCurrentState(ActivityState state) OVERRIDE; |
39 virtual ActivityState GetCurrentState() OVERRIDE; | 39 virtual ActivityState GetCurrentState() OVERRIDE; |
40 virtual bool IsVisible() OVERRIDE; | 40 virtual bool IsVisible() OVERRIDE; |
41 virtual ActivityMediaState GetMediaState() OVERRIDE; | 41 virtual ActivityMediaState GetMediaState() OVERRIDE; |
| 42 virtual aura::Window* GetWindow() OVERRIDE; |
42 | 43 |
43 // ActivityViewModel: | 44 // ActivityViewModel: |
44 virtual void Init() OVERRIDE; | 45 virtual void Init() OVERRIDE; |
45 virtual SkColor GetRepresentativeColor() const OVERRIDE; | 46 virtual SkColor GetRepresentativeColor() const OVERRIDE; |
46 virtual base::string16 GetTitle() const OVERRIDE; | 47 virtual base::string16 GetTitle() const OVERRIDE; |
47 virtual bool UsesFrame() const OVERRIDE; | 48 virtual bool UsesFrame() const OVERRIDE; |
48 virtual views::View* GetContentsView() OVERRIDE; | 49 virtual views::View* GetContentsView() OVERRIDE; |
49 virtual void CreateOverviewModeImage() OVERRIDE; | 50 virtual void CreateOverviewModeImage() OVERRIDE; |
50 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; | 51 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; |
51 | 52 |
(...skipping 15 matching lines...) Expand all Loading... |
67 | 68 |
68 // The image which will be used in overview mode. | 69 // The image which will be used in overview mode. |
69 gfx::ImageSkia overview_mode_image_; | 70 gfx::ImageSkia overview_mode_image_; |
70 | 71 |
71 DISALLOW_COPY_AND_ASSIGN(WebActivity); | 72 DISALLOW_COPY_AND_ASSIGN(WebActivity); |
72 }; | 73 }; |
73 | 74 |
74 } // namespace athena | 75 } // namespace athena |
75 | 76 |
76 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ | 77 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ |
OLD | NEW |