| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_RENDER_FRAME_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1213 #if defined(ENABLE_WEBVR) | 1213 #if defined(ENABLE_WEBVR) |
| 1214 // The VR dispatcher attached to the frame, lazily initialized. | 1214 // The VR dispatcher attached to the frame, lazily initialized. |
| 1215 std::unique_ptr<VRDispatcher> vr_dispatcher_; | 1215 std::unique_ptr<VRDispatcher> vr_dispatcher_; |
| 1216 #endif | 1216 #endif |
| 1217 | 1217 |
| 1218 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 1218 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
| 1219 // The external popup for the currently showing select popup. | 1219 // The external popup for the currently showing select popup. |
| 1220 std::unique_ptr<ExternalPopupMenu> external_popup_menu_; | 1220 std::unique_ptr<ExternalPopupMenu> external_popup_menu_; |
| 1221 #endif | 1221 #endif |
| 1222 | 1222 |
| 1223 std::unique_ptr<FrameBlameContext> blame_context_; | 1223 FrameBlameContext* blame_context_; // Not owned. |
| 1224 | 1224 |
| 1225 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 1225 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
| 1226 | 1226 |
| 1227 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 1227 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
| 1228 }; | 1228 }; |
| 1229 | 1229 |
| 1230 } // namespace content | 1230 } // namespace content |
| 1231 | 1231 |
| 1232 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 1232 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| OLD | NEW |