| 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" |
| 11 | 11 |
| 12 namespace content { | 12 namespace content { |
| 13 class BrowserContext; | 13 class BrowserContext; |
| 14 class WebContents; |
| 14 } | 15 } |
| 15 | 16 |
| 16 namespace views { | 17 namespace views { |
| 17 class WebView; | 18 class WebView; |
| 18 } | 19 } |
| 19 | 20 |
| 20 namespace athena { | 21 namespace athena { |
| 21 | 22 |
| 22 class WebActivity : public Activity, | 23 class WebActivity : public Activity, |
| 23 public ActivityViewModel, | 24 public ActivityViewModel, |
| (...skipping 13 matching lines...) Expand all Loading... |
| 37 virtual views::View* GetContentsView() OVERRIDE; | 38 virtual views::View* GetContentsView() OVERRIDE; |
| 38 | 39 |
| 39 // content::WebContentsObserver: | 40 // content::WebContentsObserver: |
| 40 virtual void TitleWasSet(content::NavigationEntry* entry, | 41 virtual void TitleWasSet(content::NavigationEntry* entry, |
| 41 bool explicit_set) OVERRIDE; | 42 bool explicit_set) OVERRIDE; |
| 42 virtual void DidUpdateFaviconURL( | 43 virtual void DidUpdateFaviconURL( |
| 43 const std::vector<content::FaviconURL>& candidates) OVERRIDE; | 44 const std::vector<content::FaviconURL>& candidates) OVERRIDE; |
| 44 | 45 |
| 45 private: | 46 private: |
| 46 content::BrowserContext* browser_context_; | 47 content::BrowserContext* browser_context_; |
| 48 content::WebContents* web_contents_; |
| 47 const GURL url_; | 49 const GURL url_; |
| 48 views::WebView* web_view_; | 50 views::WebView* web_view_; |
| 49 | 51 |
| 50 DISALLOW_COPY_AND_ASSIGN(WebActivity); | 52 DISALLOW_COPY_AND_ASSIGN(WebActivity); |
| 51 }; | 53 }; |
| 52 | 54 |
| 53 } // namespace athena | 55 } // namespace athena |
| 54 | 56 |
| 55 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ | 57 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ |
| OLD | NEW |