| 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 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 namespace athena { | 23 namespace athena { |
| 24 | 24 |
| 25 class AthenaWebView; | 25 class AthenaWebView; |
| 26 | 26 |
| 27 class WebActivity : public Activity, | 27 class WebActivity : public Activity, |
| 28 public ActivityViewModel, | 28 public ActivityViewModel, |
| 29 public content::WebContentsObserver { | 29 public content::WebContentsObserver { |
| 30 public: | 30 public: |
| 31 WebActivity(content::BrowserContext* context, const GURL& gurl); | 31 WebActivity(content::BrowserContext* context, const GURL& gurl); |
| 32 WebActivity(AthenaWebView* web_view); |
| 32 virtual ~WebActivity(); | 33 virtual ~WebActivity(); |
| 33 | 34 |
| 34 protected: | 35 protected: |
| 35 // Activity: | 36 // Activity: |
| 36 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE; | 37 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE; |
| 37 virtual void SetCurrentState(ActivityState state) OVERRIDE; | 38 virtual void SetCurrentState(ActivityState state) OVERRIDE; |
| 38 virtual ActivityState GetCurrentState() OVERRIDE; | 39 virtual ActivityState GetCurrentState() OVERRIDE; |
| 39 virtual bool IsVisible() OVERRIDE; | 40 virtual bool IsVisible() OVERRIDE; |
| 40 virtual ActivityMediaState GetMediaState() OVERRIDE; | 41 virtual ActivityMediaState GetMediaState() OVERRIDE; |
| 41 | 42 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 64 | 65 |
| 65 // The image which will be used in overview mode. | 66 // The image which will be used in overview mode. |
| 66 gfx::ImageSkia overview_mode_image_; | 67 gfx::ImageSkia overview_mode_image_; |
| 67 | 68 |
| 68 DISALLOW_COPY_AND_ASSIGN(WebActivity); | 69 DISALLOW_COPY_AND_ASSIGN(WebActivity); |
| 69 }; | 70 }; |
| 70 | 71 |
| 71 } // namespace athena | 72 } // namespace athena |
| 72 | 73 |
| 73 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ | 74 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ |
| OLD | NEW |