athena/content/web_activity.h - Issue 603033002: Get FileSelect dialog work on athena

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/web_activity.h

Issue 603033002: Get FileSelect dialog work on athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: reformat Created 6 years, 2 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/app_activity_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 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48 protected:	48 protected:

49 virtual ~WebActivity();	49 virtual ~WebActivity();

50	50

51 // Activity:	51 // Activity:

52 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;	52 virtual athena::ActivityViewModel* GetActivityViewModel() OVERRIDE;

53 virtual void SetCurrentState(ActivityState state) OVERRIDE;	53 virtual void SetCurrentState(ActivityState state) OVERRIDE;

54 virtual ActivityState GetCurrentState() OVERRIDE;	54 virtual ActivityState GetCurrentState() OVERRIDE;

55 virtual bool IsVisible() OVERRIDE;	55 virtual bool IsVisible() OVERRIDE;

56 virtual ActivityMediaState GetMediaState() OVERRIDE;	56 virtual ActivityMediaState GetMediaState() OVERRIDE;

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

	58 virtual content::WebContents* GetWebContents() OVERRIDE;

58	59

59 // ActivityViewModel:	60 // ActivityViewModel:

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

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

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

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

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

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

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

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

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

112	113

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

114	115

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

116 };	117 };

117	118

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

119	120

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

OLD	NEW