athena/content/app_activity_proxy.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_proxy.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/app_activity.cc ('k') | athena/content/app_activity_proxy.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_PROXY_H_	5 #ifndef ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_

6 #define ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_	6 #define ATHENA_CONTENT_APP_ACTIVITY_PROXY_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 23 matching lines...) Expand all Loading...
34 virtual void SetCurrentState(ActivityState state) OVERRIDE;	34 virtual void SetCurrentState(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 overrides:	40 // ActivityViewModel overrides:

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 private:	52 private:

52 // The creator of this object which needs to be informed if the object gets	53 // The creator of this object which needs to be informed if the object gets

53 // destroyed or the application should get restarted.	54 // destroyed or the application should get restarted.

(...skipping 11 matching lines...) Expand all Loading...
65	66

66 // The associated view.	67 // The associated view.

67 views::View* view_;	68 views::View* view_;

68	69

69 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy);	70 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy);

70 };	71 };

71	72

72 } // namespace athena	73 } // namespace athena

73	74

74 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_	75 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_

OLD	NEW