| 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/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/supports_user_data.h" | 8 #include "base/supports_user_data.h" |
| 9 #include "blimp/client/core/blimp_contents_impl.h" | 9 #include "blimp/client/core/contents/blimp_contents_impl.h" |
| 10 #include "blimp/client/public/blimp_client_context_delegate.h" | 10 #include "blimp/client/public/blimp_client_context_delegate.h" |
| 11 | 11 |
| 12 #if defined(OS_ANDROID) | 12 #if defined(OS_ANDROID) |
| 13 #include "blimp/client/core/android/blimp_client_context_impl_android.h" | 13 #include "blimp/client/core/android/blimp_client_context_impl_android.h" |
| 14 #endif // OS_ANDROID | 14 #endif // OS_ANDROID |
| 15 | 15 |
| 16 namespace blimp { | 16 namespace blimp { |
| 17 namespace client { | 17 namespace client { |
| 18 | 18 |
| 19 namespace { | 19 namespace { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 | 66 |
| 67 std::unique_ptr<BlimpContents> BlimpClientContextImpl::CreateBlimpContents() { | 67 std::unique_ptr<BlimpContents> BlimpClientContextImpl::CreateBlimpContents() { |
| 68 std::unique_ptr<BlimpContents> blimp_contents = | 68 std::unique_ptr<BlimpContents> blimp_contents = |
| 69 base::WrapUnique(new BlimpContentsImpl); | 69 base::WrapUnique(new BlimpContentsImpl); |
| 70 delegate_->AttachBlimpContentsHelpers(blimp_contents.get()); | 70 delegate_->AttachBlimpContentsHelpers(blimp_contents.get()); |
| 71 return blimp_contents; | 71 return blimp_contents; |
| 72 } | 72 } |
| 73 | 73 |
| 74 } // namespace client | 74 } // namespace client |
| 75 } // namespace blimp | 75 } // namespace blimp |
| OLD | NEW |