athena/content/app_activity_proxy.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/app_activity_proxy.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, 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/app_activity.cc ('k') | athena/content/app_activity_proxy.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_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 22 matching lines...) Expand all Loading...
33 protected:	33 protected:

34 virtual ~AppActivityProxy();	34 virtual ~AppActivityProxy();

35	35

36 // Activity overrides:	36 // Activity overrides:

37 virtual ActivityViewModel* GetActivityViewModel() OVERRIDE;	37 virtual ActivityViewModel* GetActivityViewModel() OVERRIDE;

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

39 virtual ActivityState GetCurrentState() OVERRIDE;	39 virtual ActivityState GetCurrentState() OVERRIDE;

40 virtual bool IsVisible() OVERRIDE;	40 virtual bool IsVisible() OVERRIDE;

41 virtual ActivityMediaState GetMediaState() OVERRIDE;	41 virtual ActivityMediaState GetMediaState() OVERRIDE;

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

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

43	44

44 // ActivityViewModel overrides:	45 // ActivityViewModel overrides:

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

46 virtual SkColor GetRepresentativeColor() const OVERRIDE;	47 virtual SkColor GetRepresentativeColor() const OVERRIDE;

47 virtual base::string16 GetTitle() const OVERRIDE;	48 virtual base::string16 GetTitle() const OVERRIDE;

48 virtual gfx::ImageSkia GetIcon() const OVERRIDE;	49 virtual gfx::ImageSkia GetIcon() const OVERRIDE;

49 virtual bool UsesFrame() const OVERRIDE;	50 virtual bool UsesFrame() const OVERRIDE;

50 virtual views::View* GetContentsView() OVERRIDE;	51 virtual views::View* GetContentsView() OVERRIDE;

51 virtual views::Widget* CreateWidget() OVERRIDE;	52 virtual views::Widget* CreateWidget() OVERRIDE;

52 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;	53 virtual gfx::ImageSkia GetOverviewModeImage() OVERRIDE;

(...skipping 19 matching lines...) Expand all Loading...
72	73

73 // The content proxy.	74 // The content proxy.

74 scoped_ptr<ContentProxy> content_proxy_;	75 scoped_ptr<ContentProxy> content_proxy_;

75	76

76 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy);	77 DISALLOW_COPY_AND_ASSIGN(AppActivityProxy);

77 };	78 };

78	79

79 } // namespace athena	80 } // namespace athena

80	81

81 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_	82 #endif // ATHENA_CONTENT_APP_ACTIVITY_PROXY_H_

OLD	NEW