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

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« no previous file with comments | « athena/content/DEPS ('k') | athena/content/app_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_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 19 matching lines...) Expand all Loading...
30 virtual void SetCurrentState(Activity::ActivityState state) OVERRIDE;	30 virtual void SetCurrentState(Activity::ActivityState state) OVERRIDE;

31 virtual ActivityState GetCurrentState() OVERRIDE;	31 virtual ActivityState GetCurrentState() OVERRIDE;

32 virtual bool IsVisible() OVERRIDE;	32 virtual bool IsVisible() OVERRIDE;

33 virtual ActivityMediaState GetMediaState() OVERRIDE;	33 virtual ActivityMediaState GetMediaState() OVERRIDE;

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

35	35

36 // ActivityViewModel:	36 // ActivityViewModel:

37 virtual void Init() OVERRIDE;	37 virtual void Init() OVERRIDE;

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

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

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

40 virtual bool UsesFrame() const OVERRIDE;	41 virtual bool UsesFrame() const OVERRIDE;

41 virtual views::View* GetContentsView() OVERRIDE;	42 virtual views::View* GetContentsView() OVERRIDE;

42 virtual void CreateOverviewModeImage() OVERRIDE;	43 virtual void CreateOverviewModeImage() OVERRIDE;

43 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;	44 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;

44 virtual void PrepareContentsForOverview() OVERRIDE;	45 virtual void PrepareContentsForOverview() OVERRIDE;

45 virtual void ResetContentsView() OVERRIDE;	46 virtual void ResetContentsView() OVERRIDE;

46	47

47 protected:	48 protected:

48 virtual ~AppActivity();	49 virtual ~AppActivity();

49	50

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

86 // as this object lives.	87 // as this object lives.

87 AppActivityRegistry* app_activity_registry_;	88 AppActivityRegistry* app_activity_registry_;

88	89

89 DISALLOW_COPY_AND_ASSIGN(AppActivity);	90 DISALLOW_COPY_AND_ASSIGN(AppActivity);

90 };	91 };

91	92

92 } // namespace athena	93 } // namespace athena

93	94

94 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_	95 #endif // ATHENA_CONTENT_APP_ACTIVITY_H_

OLD	NEW