trunk/src/athena/activity/public/activity.h - Issue 382913002: Revert 282159 "athena: Move athena_export.h into common/ directory."

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: trunk/src/athena/activity/public/activity.h

Issue 382913002: Revert 282159 "athena: Move athena_export.h into common/ directory." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 5 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:

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_ACTIVITY_PUBLIC_ACTIVITY_H_	5 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_

6 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_	6 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "athena/common/athena_export.h"	10 #include "athena/athena_export.h"

11	11

12 namespace athena {	12 namespace athena {

13	13

14 class ActivityViewModel;	14 class ActivityViewModel;

15	15

16 class ATHENA_EXPORT Activity {	16 class ATHENA_EXPORT Activity {

17 public:	17 public:

18 virtual ~Activity();	18 virtual ~Activity();

19	19

20 // The Activity retains ownership of the returned view-model.	20 // The Activity retains ownership of the returned view-model.

21 virtual ActivityViewModel* GetActivityViewModel() = 0;	21 virtual ActivityViewModel* GetActivityViewModel() = 0;

22 };	22 };

23	23

24 } // namespace athena	24 } // namespace athena

25	25

26 #endif // ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_	26 #endif // ATHENA_ACTIVITY_PUBLIC_ACTIVITY_H_

OLD	NEW