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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 #include "content/browser/renderer_host/input/input_router_impl.h" | 46 #include "content/browser/renderer_host/input/input_router_impl.h" |
47 #include "content/browser/renderer_host/input/timeout_monitor.h" | 47 #include "content/browser/renderer_host/input/timeout_monitor.h" |
48 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h" | 48 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h" |
49 #include "content/browser/renderer_host/render_process_host_impl.h" | 49 #include "content/browser/renderer_host/render_process_host_impl.h" |
50 #include "content/browser/renderer_host/render_view_host_delegate.h" | 50 #include "content/browser/renderer_host/render_view_host_delegate.h" |
51 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 51 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
52 #include "content/browser/renderer_host/render_view_host_impl.h" | 52 #include "content/browser/renderer_host/render_view_host_impl.h" |
53 #include "content/browser/renderer_host/render_widget_host_delegate.h" | 53 #include "content/browser/renderer_host/render_widget_host_delegate.h" |
54 #include "content/browser/renderer_host/render_widget_host_impl.h" | 54 #include "content/browser/renderer_host/render_widget_host_impl.h" |
55 #include "content/browser/renderer_host/render_widget_host_view_base.h" | 55 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
| 56 #include "content/browser/screen_orientation/screen_orientation_provider.h" |
56 #include "content/browser/shared_worker/shared_worker_service_impl.h" | 57 #include "content/browser/shared_worker/shared_worker_service_impl.h" |
57 #include "content/browser/websockets/websocket_manager.h" | 58 #include "content/browser/websockets/websocket_manager.h" |
58 #include "content/browser/webui/web_ui_controller_factory_registry.h" | 59 #include "content/browser/webui/web_ui_controller_factory_registry.h" |
59 #include "content/common/accessibility_messages.h" | 60 #include "content/common/accessibility_messages.h" |
60 #include "content/common/associated_interface_provider_impl.h" | 61 #include "content/common/associated_interface_provider_impl.h" |
61 #include "content/common/associated_interfaces.mojom.h" | 62 #include "content/common/associated_interfaces.mojom.h" |
62 #include "content/common/frame_messages.h" | 63 #include "content/common/frame_messages.h" |
63 #include "content/common/frame_owner_properties.h" | 64 #include "content/common/frame_owner_properties.h" |
64 #include "content/common/input_messages.h" | 65 #include "content/common/input_messages.h" |
65 #include "content/common/inter_process_time_ticks_converter.h" | 66 #include "content/common/inter_process_time_ticks_converter.h" |
(...skipping 2283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2349 base::Unretained(wake_lock_service_context))); | 2350 base::Unretained(wake_lock_service_context))); |
2350 } | 2351 } |
2351 | 2352 |
2352 if (!permission_service_context_) | 2353 if (!permission_service_context_) |
2353 permission_service_context_.reset(new PermissionServiceContext(this)); | 2354 permission_service_context_.reset(new PermissionServiceContext(this)); |
2354 | 2355 |
2355 GetInterfaceRegistry()->AddInterface( | 2356 GetInterfaceRegistry()->AddInterface( |
2356 base::Bind(&PermissionServiceContext::CreateService, | 2357 base::Bind(&PermissionServiceContext::CreateService, |
2357 base::Unretained(permission_service_context_.get()))); | 2358 base::Unretained(permission_service_context_.get()))); |
2358 | 2359 |
| 2360 GetInterfaceRegistry()->AddInterface<device::mojom::ScreenOrientation>( |
| 2361 base::Bind(&ScreenOrientationProvider::BindRequest, |
| 2362 base::Unretained(this))); |
| 2363 |
2359 GetInterfaceRegistry()->AddInterface(base::Bind( | 2364 GetInterfaceRegistry()->AddInterface(base::Bind( |
2360 &PresentationServiceImpl::CreateMojoService, base::Unretained(this))); | 2365 &PresentationServiceImpl::CreateMojoService, base::Unretained(this))); |
2361 | 2366 |
2362 GetInterfaceRegistry()->AddInterface( | 2367 GetInterfaceRegistry()->AddInterface( |
2363 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this))); | 2368 base::Bind(&MediaSessionServiceImpl::Create, base::Unretained(this))); |
2364 | 2369 |
2365 #if defined(OS_ANDROID) | 2370 #if defined(OS_ANDROID) |
2366 GetInterfaceRegistry()->AddInterface( | 2371 GetInterfaceRegistry()->AddInterface( |
2367 GetGlobalJavaInterfaces() | 2372 GetGlobalJavaInterfaces() |
2368 ->CreateInterfaceFactory<device::VibrationManager>()); | 2373 ->CreateInterfaceFactory<device::VibrationManager>()); |
(...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3506 // There is no pending NavigationEntry in these cases, so pass 0 as the | 3511 // There is no pending NavigationEntry in these cases, so pass 0 as the |
3507 // pending_nav_entry_id. If the previous handle was a prematurely aborted | 3512 // pending_nav_entry_id. If the previous handle was a prematurely aborted |
3508 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. | 3513 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. |
3509 return NavigationHandleImpl::Create( | 3514 return NavigationHandleImpl::Create( |
3510 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, | 3515 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, |
3511 params.was_within_same_page, base::TimeTicks::Now(), | 3516 params.was_within_same_page, base::TimeTicks::Now(), |
3512 entry_id_for_data_nav, false); // started_from_context_menu | 3517 entry_id_for_data_nav, false); // started_from_context_menu |
3513 } | 3518 } |
3514 | 3519 |
3515 } // namespace content | 3520 } // namespace content |
OLD | NEW |