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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 1802043002: Remove Web Bluetooth from Experimental in M50. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 9 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
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after
1049 GetID(), storage_partition_impl_->GetServiceWorkerContext())); 1049 GetID(), storage_partition_impl_->GetServiceWorkerContext()));
1050 #if defined(OS_ANDROID) 1050 #if defined(OS_ANDROID)
1051 AddFilter(new ScreenOrientationMessageFilterAndroid()); 1051 AddFilter(new ScreenOrientationMessageFilterAndroid());
1052 #endif 1052 #endif
1053 AddFilter(new GeofencingDispatcherHost( 1053 AddFilter(new GeofencingDispatcherHost(
1054 storage_partition_impl_->GetGeofencingManager())); 1054 storage_partition_impl_->GetGeofencingManager()));
1055 1055
1056 bool enable_web_bluetooth = 1056 bool enable_web_bluetooth =
1057 browser_command_line.HasSwitch(switches::kEnableWebBluetooth); 1057 browser_command_line.HasSwitch(switches::kEnableWebBluetooth);
1058 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) 1058 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
1059 enable_web_bluetooth = true; 1059 // TODO(https://crbug.com/584113) Enable Web Bluetooth Experiment.
1060 // enable_web_bluetooth = true;
1060 #endif 1061 #endif
1061 1062
1062 if (enable_web_bluetooth) { 1063 if (enable_web_bluetooth) {
1063 bluetooth_dispatcher_host_ = new BluetoothDispatcherHost(GetID()); 1064 bluetooth_dispatcher_host_ = new BluetoothDispatcherHost(GetID());
1064 AddFilter(bluetooth_dispatcher_host_.get()); 1065 AddFilter(bluetooth_dispatcher_host_.get());
1065 } 1066 }
1066 } 1067 }
1067 1068
1068 void RenderProcessHostImpl::RegisterMojoServices() { 1069 void RenderProcessHostImpl::RegisterMojoServices() {
1069 #if !defined(OS_ANDROID) 1070 #if !defined(OS_ANDROID)
(...skipping 1746 matching lines...) Expand 10 before | Expand all | Expand 10 after
2816 2817
2817 // Skip widgets in other processes. 2818 // Skip widgets in other processes.
2818 if (rvh->GetProcess()->GetID() != GetID()) 2819 if (rvh->GetProcess()->GetID() != GetID())
2819 continue; 2820 continue;
2820 2821
2821 rvh->OnWebkitPreferencesChanged(); 2822 rvh->OnWebkitPreferencesChanged();
2822 } 2823 }
2823 } 2824 }
2824 2825
2825 } // namespace content 2826 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698