OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "blimp/client/core/blimp_client_context_impl.h" | 5 #include "blimp/client/core/blimp_client_context_impl.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
11 #include "base/threading/thread.h" | 11 #include "base/threading/thread.h" |
12 #include "blimp/client/core/contents/blimp_contents_impl.h" | 12 #include "blimp/client/core/contents/blimp_contents_impl.h" |
13 #include "blimp/client/core/contents/tab_control_feature.h" | 13 #include "blimp/client/core/contents/tab_control_feature.h" |
14 #include "blimp/client/public/blimp_client_context_delegate.h" | 14 #include "blimp/client/public/blimp_client_context_delegate.h" |
15 #include "blimp/client/public/contents/blimp_contents.h" | 15 #include "blimp/client/public/contents/blimp_contents.h" |
16 #include "blimp/client/support/compositor/mock_compositor_dependencies.h" | 16 #include "blimp/client/test/compositor/mock_compositor_dependencies.h" |
17 #include "blimp/client/test/test_blimp_client_context_delegate.h" | 17 #include "blimp/client/test/test_blimp_client_context_delegate.h" |
18 #include "testing/gmock/include/gmock/gmock.h" | 18 #include "testing/gmock/include/gmock/gmock.h" |
19 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
20 #include "ui/gfx/native_widget_types.h" | 20 #include "ui/gfx/native_widget_types.h" |
21 | 21 |
22 #if defined(OS_ANDROID) | 22 #if defined(OS_ANDROID) |
23 #include "ui/android/window_android.h" | 23 #include "ui/android/window_android.h" |
24 #endif // defined(OS_ANDROID) | 24 #endif // defined(OS_ANDROID) |
25 | 25 |
26 namespace blimp { | 26 namespace blimp { |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 | 75 |
76 std::unique_ptr<BlimpContents> blimp_contents = | 76 std::unique_ptr<BlimpContents> blimp_contents = |
77 blimp_client_context.CreateBlimpContents(window_); | 77 blimp_client_context.CreateBlimpContents(window_); |
78 DCHECK(blimp_contents); | 78 DCHECK(blimp_contents); |
79 DCHECK_EQ(blimp_contents.get(), attached_blimp_contents); | 79 DCHECK_EQ(blimp_contents.get(), attached_blimp_contents); |
80 } | 80 } |
81 | 81 |
82 } // namespace | 82 } // namespace |
83 } // namespace client | 83 } // namespace client |
84 } // namespace blimp | 84 } // namespace blimp |
OLD | NEW |