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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 virtual bool UsesFrame() const OVERRIDE; | 47 virtual bool UsesFrame() const OVERRIDE; |
48 virtual views::View* GetContentsView() OVERRIDE; | 48 virtual views::View* GetContentsView() OVERRIDE; |
49 virtual void CreateOverviewModeImage() OVERRIDE; | 49 virtual void CreateOverviewModeImage() OVERRIDE; |
50 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; | 50 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; |
51 | 51 |
52 // content::WebContentsObserver: | 52 // content::WebContentsObserver: |
53 virtual void TitleWasSet(content::NavigationEntry* entry, | 53 virtual void TitleWasSet(content::NavigationEntry* entry, |
54 bool explicit_set) OVERRIDE; | 54 bool explicit_set) OVERRIDE; |
55 virtual void DidUpdateFaviconURL( | 55 virtual void DidUpdateFaviconURL( |
56 const std::vector<content::FaviconURL>& candidates) OVERRIDE; | 56 const std::vector<content::FaviconURL>& candidates) OVERRIDE; |
| 57 virtual void DidChangeThemeColor(SkColor theme_color) OVERRIDE; |
57 | 58 |
58 private: | 59 private: |
59 content::BrowserContext* browser_context_; | 60 content::BrowserContext* browser_context_; |
60 const GURL url_; | 61 const GURL url_; |
61 AthenaWebView* web_view_; | 62 AthenaWebView* web_view_; |
| 63 SkColor title_color_; |
62 | 64 |
63 // The current state for this activity. | 65 // The current state for this activity. |
64 ActivityState current_state_; | 66 ActivityState current_state_; |
65 | 67 |
66 // The image which will be used in overview mode. | 68 // The image which will be used in overview mode. |
67 gfx::ImageSkia overview_mode_image_; | 69 gfx::ImageSkia overview_mode_image_; |
68 | 70 |
69 DISALLOW_COPY_AND_ASSIGN(WebActivity); | 71 DISALLOW_COPY_AND_ASSIGN(WebActivity); |
70 }; | 72 }; |
71 | 73 |
72 } // namespace athena | 74 } // namespace athena |
73 | 75 |
74 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ | 76 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ |
OLD | NEW |