athena/content/app_activity.h - Issue 550643002: [Athena] Hack to display favicons for web activities in overview mode

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

Issue 550643002: [Athena] Hack to display favicons for web activities in overview mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/activity_frame_view.cc ('K') | « athena/content/DEPS ('k') | athena/content/app_activity.cc » ('j') | athena/content/web_activity.cc » ('J')

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_APP_ACTIVITY_H_	5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_H_

6 #define ATHENA_CONTENT_APP_ACTIVITY_H_	6 #define ATHENA_CONTENT_APP_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 23 matching lines...) Expand all Loading...
34 virtual void SetCurrentState(Activity::ActivityState state) OVERRIDE;	34 virtual void SetCurrentState(Activity::ActivityState state) OVERRIDE;

35 virtual ActivityState GetCurrentState() OVERRIDE;	35 virtual ActivityState GetCurrentState() OVERRIDE;

36 virtual bool IsVisible() OVERRIDE;	36 virtual bool IsVisible() OVERRIDE;

37 virtual ActivityMediaState GetMediaState() OVERRIDE;	37 virtual ActivityMediaState GetMediaState() OVERRIDE;

38 virtual aura::Window* GetWindow() OVERRIDE;	38 virtual aura::Window* GetWindow() OVERRIDE;

39	39

40 // ActivityViewModel:	40 // ActivityViewModel:

41 virtual void Init() OVERRIDE;	41 virtual void Init() OVERRIDE;

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

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

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

44 virtual bool UsesFrame() const OVERRIDE;	45 virtual bool UsesFrame() const OVERRIDE;

45 virtual views::View* GetContentsView() OVERRIDE;	46 virtual views::View* GetContentsView() OVERRIDE;

46 virtual void CreateOverviewModeImage() OVERRIDE;	47 virtual void CreateOverviewModeImage() OVERRIDE;

47 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;	48 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;

48 virtual void PrepareContentsForOverview() OVERRIDE;	49 virtual void PrepareContentsForOverview() OVERRIDE;

49 virtual void ResetContentsView() OVERRIDE;	50 virtual void ResetContentsView() OVERRIDE;

50	51

51 protected:	52 protected:

52 virtual ~AppActivity();	53 virtual ~AppActivity();

53	54

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
89 // This object is owned by \|AppRegistry\| and will be a valid pointer as long	90 // This object is owned by \|AppRegistry\| and will be a valid pointer as long

90 // as this object lives.	91 // as this object lives.

91 AppActivityRegistry* app_activity_registry_;	92 AppActivityRegistry* app_activity_registry_;

92	93

93 DISALLOW_COPY_AND_ASSIGN(AppActivity);	94 DISALLOW_COPY_AND_ASSIGN(AppActivity);

94 };	95 };

95	96

96 } // namespace athena	97 } // namespace athena

97	98

98 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_	99 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_

OLD	NEW