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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2357383002: bluetooth: Add device list retrieval for chrome://bluetooth-internals (Closed)
Patch Set: Revert chrome browser client file 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 #include "content/public/browser/vpn_service_proxy.h" 157 #include "content/public/browser/vpn_service_proxy.h"
158 #include "content/public/browser/web_contents.h" 158 #include "content/public/browser/web_contents.h"
159 #include "content/public/common/child_process_host.h" 159 #include "content/public/common/child_process_host.h"
160 #include "content/public/common/content_descriptors.h" 160 #include "content/public/common/content_descriptors.h"
161 #include "content/public/common/content_features.h" 161 #include "content/public/common/content_features.h"
162 #include "content/public/common/content_switches.h" 162 #include "content/public/common/content_switches.h"
163 #include "content/public/common/mojo_shell_connection.h" 163 #include "content/public/common/mojo_shell_connection.h"
164 #include "content/public/common/sandbox_type.h" 164 #include "content/public/common/sandbox_type.h"
165 #include "content/public/common/url_utils.h" 165 #include "content/public/common/url_utils.h"
166 #include "content/public/common/web_preferences.h" 166 #include "content/public/common/web_preferences.h"
167 #include "device/bluetooth/adapter.h"
ortuno 2016/09/28 09:44:54 I think you need to add the device/bluetooth depen
mbrunson 2016/09/28 21:20:34 Done.
168 #include "device/bluetooth/public/interfaces/adapter.mojom.h"
167 #include "device/usb/public/interfaces/chooser_service.mojom.h" 169 #include "device/usb/public/interfaces/chooser_service.mojom.h"
168 #include "device/usb/public/interfaces/device_manager.mojom.h" 170 #include "device/usb/public/interfaces/device_manager.mojom.h"
169 #include "gin/v8_initializer.h" 171 #include "gin/v8_initializer.h"
170 #include "net/base/mime_util.h" 172 #include "net/base/mime_util.h"
171 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 173 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
172 #include "net/cookies/canonical_cookie.h" 174 #include "net/cookies/canonical_cookie.h"
173 #include "net/cookies/cookie_options.h" 175 #include "net/cookies/cookie_options.h"
174 #include "net/ssl/ssl_cert_request_info.h" 176 #include "net/ssl/ssl_cert_request_info.h"
175 #include "ppapi/host/ppapi_host.h" 177 #include "ppapi/host/ppapi_host.h"
176 #include "services/shell/public/cpp/service.h" 178 #include "services/shell/public/cpp/service.h"
(...skipping 2727 matching lines...) Expand 10 before | Expand all | Expand 10 after
2904 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs( 2906 !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs(
2905 extensions::kExtensionScheme) 2907 extensions::kExtensionScheme)
2906 #endif 2908 #endif
2907 ) { 2909 ) {
2908 registry->AddInterface( 2910 registry->AddInterface(
2909 base::Bind(&CreateUsbDeviceManager, render_frame_host)); 2911 base::Bind(&CreateUsbDeviceManager, render_frame_host));
2910 registry->AddInterface( 2912 registry->AddInterface(
2911 base::Bind(&CreateWebUsbChooserService, render_frame_host)); 2913 base::Bind(&CreateWebUsbChooserService, render_frame_host));
2912 } 2914 }
2913 2915
2916 registry->AddInterface<bluetooth::mojom::Adapter>(
2917 base::Bind(&bluetooth::Adapter::Create));
2918
2914 if (!render_frame_host->GetParent()) { 2919 if (!render_frame_host->GetParent()) {
2915 // Register mojo CredentialManager interface only for main frame. 2920 // Register mojo CredentialManager interface only for main frame.
2916 registry->AddInterface( 2921 registry->AddInterface(
2917 base::Bind(&ChromePasswordManagerClient::BindCredentialManager, 2922 base::Bind(&ChromePasswordManagerClient::BindCredentialManager,
2918 render_frame_host)); 2923 render_frame_host));
2919 // Register mojo ContentTranslateDriver interface only for main frame. 2924 // Register mojo ContentTranslateDriver interface only for main frame.
2920 registry->AddInterface(base::Bind( 2925 registry->AddInterface(base::Bind(
2921 &ChromeTranslateClient::BindContentTranslateDriver, render_frame_host)); 2926 &ChromeTranslateClient::BindContentTranslateDriver, render_frame_host));
2922 } 2927 }
2923 2928
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
3168 if (channel <= kMaxDisableEncryptionChannel) { 3173 if (channel <= kMaxDisableEncryptionChannel) {
3169 static const char* const kWebRtcDevSwitchNames[] = { 3174 static const char* const kWebRtcDevSwitchNames[] = {
3170 switches::kDisableWebRtcEncryption, 3175 switches::kDisableWebRtcEncryption,
3171 }; 3176 };
3172 to_command_line->CopySwitchesFrom(from_command_line, 3177 to_command_line->CopySwitchesFrom(from_command_line,
3173 kWebRtcDevSwitchNames, 3178 kWebRtcDevSwitchNames,
3174 arraysize(kWebRtcDevSwitchNames)); 3179 arraysize(kWebRtcDevSwitchNames));
3175 } 3180 }
3176 } 3181 }
3177 #endif // defined(ENABLE_WEBRTC) 3182 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698