| 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 #include "athena/test/sample_activity.h" | 5 #include "athena/test/base/sample_activity.h" |
| 6 | 6 |
| 7 #include "ui/gfx/image/image_skia.h" | 7 #include "ui/gfx/image/image_skia.h" |
| 8 #include "ui/views/background.h" | 8 #include "ui/views/background.h" |
| 9 #include "ui/views/view.h" | 9 #include "ui/views/view.h" |
| 10 #include "ui/views/widget/widget.h" | 10 #include "ui/views/widget/widget.h" |
| 11 | 11 |
| 12 namespace athena { | 12 namespace athena { |
| 13 namespace test { | 13 namespace test { |
| 14 | 14 |
| 15 SampleActivity::SampleActivity(SkColor color, | 15 SampleActivity::SampleActivity(SkColor color, |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 } | 91 } |
| 92 | 92 |
| 93 void SampleActivity::PrepareContentsForOverview() { | 93 void SampleActivity::PrepareContentsForOverview() { |
| 94 } | 94 } |
| 95 | 95 |
| 96 void SampleActivity::ResetContentsView() { | 96 void SampleActivity::ResetContentsView() { |
| 97 } | 97 } |
| 98 | 98 |
| 99 } // namespace test | 99 } // namespace test |
| 100 } // namespace athena | 100 } // namespace athena |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 617043002:
Moving athena/test to athena/test/base (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master