Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: trunk/src/athena/activity/public/activity_view_model.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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/athena/activity/public/activity_view_manager.h ('k') | trunk/src/athena/athena.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_VIEW_MODEL_H_ 5 #ifndef ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_
6 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_ 6 #define ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_
7 7
8 #include "athena/common/athena_export.h" 8 #include "athena/athena_export.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 10
11 typedef unsigned int SkColor; 11 typedef unsigned int SkColor;
12 12
13 namespace views { 13 namespace views {
14 class View; 14 class View;
15 } 15 }
16 16
17 namespace athena { 17 namespace athena {
18 18
(...skipping 10 matching lines...) Expand all
29 // Returns a title for the activity. 29 // Returns a title for the activity.
30 virtual base::string16 GetTitle() = 0; 30 virtual base::string16 GetTitle() = 0;
31 31
32 // Returns the contents view. 32 // Returns the contents view.
33 virtual views::View* GetContentsView() = 0; 33 virtual views::View* GetContentsView() = 0;
34 }; 34 };
35 35
36 } // namespace athena 36 } // namespace athena
37 37
38 #endif // ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_ 38 #endif // ATHENA_ACTIVITY_PUBLIC_ACTIVITY_VIEW_MODEL_H_
OLDNEW
« no previous file with comments | « trunk/src/athena/activity/public/activity_view_manager.h ('k') | trunk/src/athena/athena.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698