athena/content/web_activity.h - Issue 591693002: Creating PNG images from web content to be used by OverviewMode navigation

Side by Side Diff: athena/content/web_activity.h

Issue 591693002: Creating PNG images from web content to be used by OverviewMode navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« athena/activity/public/activity_view_model.h ('K') | « athena/content/content_proxy.cc ('k') | athena/content/web_activity.cc » ('j') | no next file with comments »

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 virtual aura::Window* GetWindow() OVERRIDE;	57 virtual aura::Window* GetWindow() OVERRIDE;

58	58

59 // ActivityViewModel:	59 // ActivityViewModel:

60 virtual void Init() OVERRIDE;	60 virtual void Init() OVERRIDE;

61 virtual SkColor GetRepresentativeColor() const OVERRIDE;	61 virtual SkColor GetRepresentativeColor() const OVERRIDE;

62 virtual base::string16 GetTitle() const OVERRIDE;	62 virtual base::string16 GetTitle() const OVERRIDE;

63 virtual gfx::ImageSkia GetIcon() const OVERRIDE;	63 virtual gfx::ImageSkia GetIcon() const OVERRIDE;

64 virtual bool UsesFrame() const OVERRIDE;	64 virtual bool UsesFrame() const OVERRIDE;

65 virtual views::View* GetContentsView() OVERRIDE;	65 virtual views::View* GetContentsView() OVERRIDE;

66 virtual views::Widget* CreateWidget() OVERRIDE;	66 virtual views::Widget* CreateWidget() OVERRIDE;

67 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;	67 virtual gfx::Image GetOverviewModeImage() OVERRIDE;

68 virtual void PrepareContentsForOverview() OVERRIDE;	68 virtual void PrepareContentsForOverview() OVERRIDE;

69 virtual void ResetContentsView() OVERRIDE;	69 virtual void ResetContentsView() OVERRIDE;

70	70

71 // content::WebContentsObserver:	71 // content::WebContentsObserver:

72 virtual void DidNavigateMainFrame(	72 virtual void DidNavigateMainFrame(

73 const content::LoadCommittedDetails& details,	73 const content::LoadCommittedDetails& details,

74 const content::FrameNavigateParams& params) OVERRIDE;	74 const content::FrameNavigateParams& params) OVERRIDE;

75 virtual void TitleWasSet(content::NavigationEntry* entry,	75 virtual void TitleWasSet(content::NavigationEntry* entry,

76 bool explicit_set) OVERRIDE;	76 bool explicit_set) OVERRIDE;

77 virtual void DidUpdateFaviconURL(	77 virtual void DidUpdateFaviconURL(

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 scoped_ptr<ContentProxy> content_proxy_;	111 scoped_ptr<ContentProxy> content_proxy_;

112	112

113 base::WeakPtrFactory<WebActivity> weak_ptr_factory_;	113 base::WeakPtrFactory<WebActivity> weak_ptr_factory_;

114	114

115 DISALLOW_COPY_AND_ASSIGN(WebActivity);	115 DISALLOW_COPY_AND_ASSIGN(WebActivity);

116 };	116 };

117	117

118 } // namespace athena	118 } // namespace athena

119	119

120 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_	120 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_

OLD	NEW