| OLD | NEW | 
|---|
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 CONTENT_RENDERER_POSSIBLY_ASSOCIATED_INTERFACE_PTR_H_ | 5 #ifndef CONTENT_COMMON_POSSIBLY_ASSOCIATED_INTERFACE_PTR_H_ | 
| 6 #define CONTENT_RENDERER_POSSIBLY_ASSOCIATED_INTERFACE_PTR_H_ | 6 #define CONTENT_COMMON_POSSIBLY_ASSOCIATED_INTERFACE_PTR_H_ | 
| 7 | 7 | 
| 8 #include "base/macros.h" | 8 #include "base/macros.h" | 
| 9 #include "mojo/public/cpp/bindings/associated_interface_ptr.h" | 9 #include "mojo/public/cpp/bindings/associated_interface_ptr.h" | 
| 10 #include "mojo/public/cpp/bindings/interface_ptr.h" | 10 #include "mojo/public/cpp/bindings/interface_ptr.h" | 
| 11 | 11 | 
| 12 namespace content { | 12 namespace content { | 
| 13 | 13 | 
| 14 // PossiblyAssociatedInterfacePtr<T> contains mojo::InterfacePtr<T> or | 14 // PossiblyAssociatedInterfacePtr<T> contains mojo::InterfacePtr<T> or | 
| 15 // mojo::AssociatedInterfacePtr<T>, but not both. Mojo-related functions in | 15 // mojo::AssociatedInterfacePtr<T>, but not both. Mojo-related functions in | 
| 16 // mojo::InterfacePtr<T> and mojo::AssociatedInterfacePtr<T> are not accessible, | 16 // mojo::InterfacePtr<T> and mojo::AssociatedInterfacePtr<T> are not accessible, | 
| (...skipping 30 matching lines...) Expand all  Loading... | 
| 47 | 47 | 
| 48  private: | 48  private: | 
| 49   mojo::InterfacePtr<T> independent_ptr_; | 49   mojo::InterfacePtr<T> independent_ptr_; | 
| 50   mojo::AssociatedInterfacePtr<T> associated_ptr_; | 50   mojo::AssociatedInterfacePtr<T> associated_ptr_; | 
| 51 | 51 | 
| 52   DISALLOW_COPY_AND_ASSIGN(PossiblyAssociatedInterfacePtr); | 52   DISALLOW_COPY_AND_ASSIGN(PossiblyAssociatedInterfacePtr); | 
| 53 }; | 53 }; | 
| 54 | 54 | 
| 55 }  // namespace content | 55 }  // namespace content | 
| 56 | 56 | 
| 57 #endif  // CONTENT_RENDERER_POSSIBLY_ASSOCIATED_INTERFACE_PTR_H_ | 57 #endif  // CONTENT_COMMON_POSSIBLY_ASSOCIATED_INTERFACE_PTR_H_ | 
| OLD | NEW | 
|---|