Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 #include "content/public/common/url_utils.h" 92 #include "content/public/common/url_utils.h"
93 #include "device/generic_sensor/sensor_provider_impl.h" 93 #include "device/generic_sensor/sensor_provider_impl.h"
94 #include "device/geolocation/geolocation_service_context.h" 94 #include "device/geolocation/geolocation_service_context.h"
95 #include "device/vibration/vibration_manager_impl.h" 95 #include "device/vibration/vibration_manager_impl.h"
96 #include "device/wake_lock/wake_lock_service_context.h" 96 #include "device/wake_lock/wake_lock_service_context.h"
97 #include "media/base/media_switches.h" 97 #include "media/base/media_switches.h"
98 #include "media/mojo/interfaces/media_service.mojom.h" 98 #include "media/mojo/interfaces/media_service.mojom.h"
99 #include "media/mojo/interfaces/service_factory.mojom.h" 99 #include "media/mojo/interfaces/service_factory.mojom.h"
100 #include "mojo/public/cpp/bindings/associated_interface_ptr.h" 100 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
101 #include "mojo/public/cpp/bindings/strong_binding.h" 101 #include "mojo/public/cpp/bindings/strong_binding.h"
102 #include "services/shell/public/cpp/connector.h" 102 #include "services/service_manager/public/cpp/connector.h"
103 #include "services/shell/public/cpp/interface_provider.h" 103 #include "services/service_manager/public/cpp/interface_provider.h"
104 #include "third_party/WebKit/public/platform/modules/shapedetection/shapedetecti on.mojom.h" 104 #include "third_party/WebKit/public/platform/modules/shapedetection/shapedetecti on.mojom.h"
105 #include "ui/accessibility/ax_tree.h" 105 #include "ui/accessibility/ax_tree.h"
106 #include "ui/accessibility/ax_tree_update.h" 106 #include "ui/accessibility/ax_tree_update.h"
107 #include "ui/gfx/geometry/quad_f.h" 107 #include "ui/gfx/geometry/quad_f.h"
108 #include "url/gurl.h" 108 #include "url/gurl.h"
109 109
110 #if defined(OS_ANDROID) 110 #if defined(OS_ANDROID)
111 #include "content/browser/android/app_web_message_port_message_filter.h" 111 #include "content/browser/android/app_web_message_port_message_filter.h"
112 #include "content/public/browser/android/java_interfaces.h" 112 #include "content/public/browser/android/java_interfaces.h"
113 #if defined(ENABLE_MOJO_CDM) 113 #if defined(ENABLE_MOJO_CDM)
(...skipping 3069 matching lines...) Expand 10 before | Expand all | Expand 10 after
3183 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 3183 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
3184 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 3184 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
3185 return web_bluetooth_service_.get(); 3185 return web_bluetooth_service_.get();
3186 } 3186 }
3187 3187
3188 void RenderFrameHostImpl::DeleteWebBluetoothService() { 3188 void RenderFrameHostImpl::DeleteWebBluetoothService() {
3189 web_bluetooth_service_.reset(); 3189 web_bluetooth_service_.reset();
3190 } 3190 }
3191 3191
3192 } // namespace content 3192 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.h ('k') | content/browser/gpu/browser_gpu_channel_host_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698