athena/content/web_activity.h - Issue 558243002: V2 app support step2 : Use NativeAppWindow for Activity's window.

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

Issue 558243002: V2 app support step2 : Use NativeAppWindow for Activity's window. (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/content/chrome/content_activity_factory.cc ('K') | « athena/content/shell/shell_app_activity.cc ('k') | athena/content/web_activity.cc » ('j') | athena/extensions/chrome/athena_apps_client.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "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 "base/strings/string16.h"	10 #include "base/strings/string16.h"

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 virtual bool IsVisible() OVERRIDE;	44 virtual bool IsVisible() OVERRIDE;

45 virtual ActivityMediaState GetMediaState() OVERRIDE;	45 virtual ActivityMediaState GetMediaState() OVERRIDE;

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

47	47

48 // ActivityViewModel:	48 // ActivityViewModel:

49 virtual void Init() OVERRIDE;	49 virtual void Init() OVERRIDE;

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

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

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

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

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

54 virtual void CreateOverviewModeImage() OVERRIDE;	55 virtual void CreateOverviewModeImage() OVERRIDE;

55 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;	56 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;

56 virtual void PrepareContentsForOverview() OVERRIDE;	57 virtual void PrepareContentsForOverview() OVERRIDE;

57 virtual void ResetContentsView() OVERRIDE;	58 virtual void ResetContentsView() OVERRIDE;

58	59

59 // content::WebContentsObserver:	60 // content::WebContentsObserver:

60 virtual void TitleWasSet(content::NavigationEntry* entry,	61 virtual void TitleWasSet(content::NavigationEntry* entry,

61 bool explicit_set) OVERRIDE;	62 bool explicit_set) OVERRIDE;

62 virtual void DidUpdateFaviconURL(	63 virtual void DidUpdateFaviconURL(

63 const std::vector<content::FaviconURL>& candidates) OVERRIDE;	64 const std::vector<content::FaviconURL>& candidates) OVERRIDE;

(...skipping 22 matching lines...) Expand all Loading...
86	87

87 // The image which will be used in overview mode.	88 // The image which will be used in overview mode.

88 gfx::ImageSkia overview_mode_image_;	89 gfx::ImageSkia overview_mode_image_;

89	90

90 DISALLOW_COPY_AND_ASSIGN(WebActivity);	91 DISALLOW_COPY_AND_ASSIGN(WebActivity);

91 };	92 };

92	93

93 } // namespace athena	94 } // namespace athena

94	95

95 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_	96 #endif // ATHENA_CONTENT_WEB_ACTIVITY_H_

OLD	NEW