| 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 <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "athena/activity/public/activity.h" | 10 #include "athena/activity/public/activity.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 aura::Window* GetWindow() override; | 57 aura::Window* GetWindow() override; |
| 58 content::WebContents* GetWebContents() override; | 58 content::WebContents* GetWebContents() override; |
| 59 | 59 |
| 60 // ActivityViewModel: | 60 // ActivityViewModel: |
| 61 void Init() override; | 61 void Init() override; |
| 62 SkColor GetRepresentativeColor() const override; | 62 SkColor GetRepresentativeColor() const override; |
| 63 base::string16 GetTitle() const override; | 63 base::string16 GetTitle() const override; |
| 64 gfx::ImageSkia GetIcon() const override; | 64 gfx::ImageSkia GetIcon() const override; |
| 65 bool UsesFrame() const override; | 65 bool UsesFrame() const override; |
| 66 views::View* GetContentsView() override; | 66 views::View* GetContentsView() override; |
| 67 views::Widget* CreateWidget() override; | |
| 68 gfx::ImageSkia GetOverviewModeImage() override; | 67 gfx::ImageSkia GetOverviewModeImage() override; |
| 69 void PrepareContentsForOverview() override; | 68 void PrepareContentsForOverview() override; |
| 70 void ResetContentsView() override; | 69 void ResetContentsView() override; |
| 71 | 70 |
| 72 // content::WebContentsObserver: | 71 // content::WebContentsObserver: |
| 73 void DidNavigateMainFrame( | 72 void DidNavigateMainFrame( |
| 74 const content::LoadCommittedDetails& details, | 73 const content::LoadCommittedDetails& details, |
| 75 const content::FrameNavigateParams& params) override; | 74 const content::FrameNavigateParams& params) override; |
| 76 void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) override; | 75 void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) override; |
| 77 void DidUpdateFaviconURL( | 76 void DidUpdateFaviconURL( |
| (...skipping 29 matching lines...) Expand all Loading... |
| 107 scoped_ptr<ContentProxy> content_proxy_; | 106 scoped_ptr<ContentProxy> content_proxy_; |
| 108 | 107 |
| 109 base::WeakPtrFactory<WebActivity> weak_ptr_factory_; | 108 base::WeakPtrFactory<WebActivity> weak_ptr_factory_; |
| 110 | 109 |
| 111 DISALLOW_COPY_AND_ASSIGN(WebActivity); | 110 DISALLOW_COPY_AND_ASSIGN(WebActivity); |
| 112 }; | 111 }; |
| 113 | 112 |
| 114 } // namespace athena | 113 } // namespace athena |
| 115 | 114 |
| 116 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ | 115 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ |
| OLD | NEW |