| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 ASH_TEST_ASH_TEST_BASE_H_ | 5 #ifndef ASH_TEST_ASH_TEST_BASE_H_ |
| 6 #define ASH_TEST_ASH_TEST_BASE_H_ | 6 #define ASH_TEST_ASH_TEST_BASE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 #include "third_party/skia/include/core/SkColor.h" | 14 #include "third_party/skia/include/core/SkColor.h" |
| 15 #include "ui/aura/client/window_types.h" | 15 #include "ui/aura/client/window_types.h" |
| 16 #include "ui/views/test/test_views_delegate.h" | 16 #include "ui/views/test/test_views_delegate.h" |
| 17 | 17 |
| 18 #if defined(OS_WIN) | 18 #if defined(OS_WIN) |
| 19 #include "base/memory/scoped_ptr.h" | 19 #include "base/memory/scoped_ptr.h" |
| 20 #include "ui/base/win/scoped_ole_initializer.h" |
| 20 #endif | 21 #endif |
| 21 | 22 |
| 22 namespace aura { | 23 namespace aura { |
| 23 class Window; | 24 class Window; |
| 24 class WindowDelegate; | 25 class WindowDelegate; |
| 25 | 26 |
| 26 namespace test { | 27 namespace test { |
| 27 class EventGenerator; | 28 class EventGenerator; |
| 28 } // namespace test | 29 } // namespace test |
| 29 } // namespace aura | 30 } // namespace aura |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 void SetCanLockScreen(bool can_lock_screen); | 106 void SetCanLockScreen(bool can_lock_screen); |
| 106 | 107 |
| 107 private: | 108 private: |
| 108 MessageLoopForUI message_loop_; | 109 MessageLoopForUI message_loop_; |
| 109 | 110 |
| 110 TestShellDelegate* test_shell_delegate_; | 111 TestShellDelegate* test_shell_delegate_; |
| 111 | 112 |
| 112 scoped_ptr<aura::test::EventGenerator> event_generator_; | 113 scoped_ptr<aura::test::EventGenerator> event_generator_; |
| 113 #if defined(OS_WIN) | 114 #if defined(OS_WIN) |
| 114 scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_; | 115 scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_; |
| 116 ui::ScopedOleInitializer ole_initializer_; |
| 115 #endif | 117 #endif |
| 116 | 118 |
| 117 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; | 119 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; |
| 118 | 120 |
| 119 DISALLOW_COPY_AND_ASSIGN(AshTestBase); | 121 DISALLOW_COPY_AND_ASSIGN(AshTestBase); |
| 120 }; | 122 }; |
| 121 | 123 |
| 122 } // namespace test | 124 } // namespace test |
| 123 } // namespace ash | 125 } // namespace ash |
| 124 | 126 |
| 125 #endif // ASH_TEST_ASH_TEST_BASE_H_ | 127 #endif // ASH_TEST_ASH_TEST_BASE_H_ |
| OLD | NEW |