| 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" |
| 11 #include "athena/activity/public/activity_view_model.h" | 11 #include "athena/activity/public/activity_view_model.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 14 #include "base/strings/string16.h" | 14 #include "base/strings/string16.h" |
| 15 #include "content/public/browser/web_contents_observer.h" | 15 #include "content/public/browser/web_contents_observer.h" |
| 16 #include "ui/gfx/image/image.h" |
| 16 #include "ui/gfx/image/image_skia.h" | 17 #include "ui/gfx/image/image_skia.h" |
| 17 | 18 |
| 18 class SkBitmap; | 19 class SkBitmap; |
| 19 | 20 |
| 20 namespace content { | 21 namespace content { |
| 21 class BrowserContext; | 22 class BrowserContext; |
| 22 class WebContents; | 23 class WebContents; |
| 23 } | 24 } |
| 24 | 25 |
| 25 namespace gfx { | 26 namespace gfx { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 virtual aura::Window* GetWindow() OVERRIDE; | 58 virtual aura::Window* GetWindow() OVERRIDE; |
| 58 | 59 |
| 59 // ActivityViewModel: | 60 // ActivityViewModel: |
| 60 virtual void Init() OVERRIDE; | 61 virtual void Init() OVERRIDE; |
| 61 virtual SkColor GetRepresentativeColor() const OVERRIDE; | 62 virtual SkColor GetRepresentativeColor() const OVERRIDE; |
| 62 virtual base::string16 GetTitle() const OVERRIDE; | 63 virtual base::string16 GetTitle() const OVERRIDE; |
| 63 virtual gfx::ImageSkia GetIcon() const OVERRIDE; | 64 virtual gfx::ImageSkia GetIcon() const OVERRIDE; |
| 64 virtual bool UsesFrame() const OVERRIDE; | 65 virtual bool UsesFrame() const OVERRIDE; |
| 65 virtual views::View* GetContentsView() OVERRIDE; | 66 virtual views::View* GetContentsView() OVERRIDE; |
| 66 virtual views::Widget* CreateWidget() OVERRIDE; | 67 virtual views::Widget* CreateWidget() OVERRIDE; |
| 67 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE; | 68 virtual scoped_ptr<gfx::Image> GetOverviewModeImage() OVERRIDE; |
| 68 virtual void PrepareContentsForOverview() OVERRIDE; | 69 virtual void PrepareContentsForOverview() OVERRIDE; |
| 69 virtual void ResetContentsView() OVERRIDE; | 70 virtual void ResetContentsView() OVERRIDE; |
| 70 | 71 |
| 71 // content::WebContentsObserver: | 72 // content::WebContentsObserver: |
| 72 virtual void DidNavigateMainFrame( | 73 virtual void DidNavigateMainFrame( |
| 73 const content::LoadCommittedDetails& details, | 74 const content::LoadCommittedDetails& details, |
| 74 const content::FrameNavigateParams& params) OVERRIDE; | 75 const content::FrameNavigateParams& params) OVERRIDE; |
| 75 virtual void TitleWasSet(content::NavigationEntry* entry, | 76 virtual void TitleWasSet(content::NavigationEntry* entry, |
| 76 bool explicit_set) OVERRIDE; | 77 bool explicit_set) OVERRIDE; |
| 77 virtual void DidUpdateFaviconURL( | 78 virtual void DidUpdateFaviconURL( |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 scoped_ptr<ContentProxy> content_proxy_; | 112 scoped_ptr<ContentProxy> content_proxy_; |
| 112 | 113 |
| 113 base::WeakPtrFactory<WebActivity> weak_ptr_factory_; | 114 base::WeakPtrFactory<WebActivity> weak_ptr_factory_; |
| 114 | 115 |
| 115 DISALLOW_COPY_AND_ASSIGN(WebActivity); | 116 DISALLOW_COPY_AND_ASSIGN(WebActivity); |
| 116 }; | 117 }; |
| 117 | 118 |
| 118 } // namespace athena | 119 } // namespace athena |
| 119 | 120 |
| 120 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ | 121 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_ |
| OLD | NEW |