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

Side by Side Diff: athena/test/base/sample_activity.h

Issue 617043002: Moving athena/test to athena/test/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/test/base/athena_unittests.cc ('k') | athena/test/base/sample_activity.cc » ('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_TEST_SAMPLE_ACTIVITY_H_ 5 #ifndef ATHENA_TEST_BASE_SAMPLE_ACTIVITY_H_
6 #define ATHENA_TEST_SAMPLE_ACTIVITY_H_ 6 #define ATHENA_TEST_BASE_SAMPLE_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 10
11 namespace gfx { 11 namespace gfx {
12 class ImageSkia; 12 class ImageSkia;
13 } 13 }
14 14
15 namespace athena { 15 namespace athena {
16 namespace test { 16 namespace test {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 // The current state for this activity. 53 // The current state for this activity.
54 ActivityState current_state_; 54 ActivityState current_state_;
55 55
56 DISALLOW_COPY_AND_ASSIGN(SampleActivity); 56 DISALLOW_COPY_AND_ASSIGN(SampleActivity);
57 }; 57 };
58 58
59 } // namespace test 59 } // namespace test
60 } // namespace athena 60 } // namespace athena
61 61
62 #endif // ATHENA_TEST_SAMPLE_ACTIVITY_H_ 62 #endif // ATHENA_TEST_BASE_SAMPLE_ACTIVITY_H_
OLDNEW
« no previous file with comments | « athena/test/base/athena_unittests.cc ('k') | athena/test/base/sample_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698