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

Side by Side Diff: content/browser/bluetooth/bluetooth_dispatcher_host.h

Issue 1048313003: Revert of bluetooth: Move requestDevice() to UI thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | content/browser/bluetooth/bluetooth_dispatcher_host.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_ 5 #ifndef CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
6 #define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_ 6 #define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "content/common/bluetooth/bluetooth_error.h" 9 #include "content/common/bluetooth/bluetooth_error.h"
10 #include "content/public/browser/browser_message_filter.h" 10 #include "content/public/browser/browser_message_filter.h"
(...skipping 20 matching lines...) Expand all
31 BluetoothDispatcherHost(); 31 BluetoothDispatcherHost();
32 ~BluetoothDispatcherHost() override; 32 ~BluetoothDispatcherHost() override;
33 33
34 private: 34 private:
35 // Set |adapter_| to a BluetoothAdapter instance and register observers, 35 // Set |adapter_| to a BluetoothAdapter instance and register observers,
36 // releasing references to previous |adapter_|. 36 // releasing references to previous |adapter_|.
37 void set_adapter(scoped_refptr<device::BluetoothAdapter> adapter); 37 void set_adapter(scoped_refptr<device::BluetoothAdapter> adapter);
38 38
39 // IPC Handlers, see definitions in bluetooth_messages.h. 39 // IPC Handlers, see definitions in bluetooth_messages.h.
40 void OnRequestDevice(int thread_id, int request_id); 40 void OnRequestDevice(int thread_id, int request_id);
41 void OnRequestDeviceOnUI(int thread_id, int request_id);
42 void OnSetBluetoothMockDataSetForTesting(const std::string& name); 41 void OnSetBluetoothMockDataSetForTesting(const std::string& name);
43 42
44 // A BluetoothAdapter instance representing an adapter of the system. 43 // A BluetoothAdapter instance representing an adapter of the system.
45 scoped_refptr<device::BluetoothAdapter> adapter_; 44 scoped_refptr<device::BluetoothAdapter> adapter_;
46 45
47 enum class MockData { NOT_MOCKING, REJECT, RESOLVE }; 46 enum class MockData { NOT_MOCKING, REJECT, RESOLVE };
48 MockData bluetooth_mock_data_set_; 47 MockData bluetooth_mock_data_set_;
49 BluetoothError bluetooth_request_device_reject_type_; 48 BluetoothError bluetooth_request_device_reject_type_;
50 49
51 DISALLOW_COPY_AND_ASSIGN(BluetoothDispatcherHost); 50 DISALLOW_COPY_AND_ASSIGN(BluetoothDispatcherHost);
52 }; 51 };
53 52
54 } // namespace content 53 } // namespace content
55 54
56 #endif // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_ 55 #endif // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DISPATCHER_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/bluetooth/bluetooth_dispatcher_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698