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 #include "content/browser/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 #include "content/browser/media/android/media_player_renderer.h" | 117 #include "content/browser/media/android/media_player_renderer.h" |
118 #include "media/base/audio_renderer_sink.h" | 118 #include "media/base/audio_renderer_sink.h" |
119 #include "media/base/video_renderer_sink.h" | 119 #include "media/base/video_renderer_sink.h" |
120 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck | 120 #include "media/mojo/services/mojo_renderer_service.h" // nogncheck |
121 #endif | 121 #endif |
122 | 122 |
123 #if defined(OS_MACOSX) | 123 #if defined(OS_MACOSX) |
124 #include "content/browser/frame_host/popup_menu_helper_mac.h" | 124 #include "content/browser/frame_host/popup_menu_helper_mac.h" |
125 #endif | 125 #endif |
126 | 126 |
| 127 #if defined(ENABLE_WEBVR) |
127 #include "device/vr/vr_service_impl.h" // nogncheck | 128 #include "device/vr/vr_service_impl.h" // nogncheck |
| 129 #else |
| 130 #include "device/vr/vr_service.mojom.h" // nogncheck |
| 131 #endif |
128 | 132 |
129 using base::TimeDelta; | 133 using base::TimeDelta; |
130 | 134 |
131 namespace content { | 135 namespace content { |
132 | 136 |
133 namespace { | 137 namespace { |
134 | 138 |
135 // The next value to use for the accessibility reset token. | 139 // The next value to use for the accessibility reset token. |
136 int g_next_accessibility_reset_token = 1; | 140 int g_next_accessibility_reset_token = 1; |
137 | 141 |
(...skipping 3264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3402 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3406 // There is no pending NavigationEntry in these cases, so pass 0 as the |
3403 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3407 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
3404 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3408 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
3405 return NavigationHandleImpl::Create( | 3409 return NavigationHandleImpl::Create( |
3406 params.url, frame_tree_node_, is_renderer_initiated, | 3410 params.url, frame_tree_node_, is_renderer_initiated, |
3407 params.was_within_same_page, base::TimeTicks::Now(), | 3411 params.was_within_same_page, base::TimeTicks::Now(), |
3408 entry_id_for_data_nav, false); // started_from_context_menu | 3412 entry_id_for_data_nav, false); // started_from_context_menu |
3409 } | 3413 } |
3410 | 3414 |
3411 } // namespace content | 3415 } // namespace content |
OLD | NEW |