46f3491c7d
* chore: bump chromium in DEPS to d5c9bf9e2a18fa508201a88e5803bec1d107b1ae * chore: bump chromium in DEPS to 45f1316afae33e52c92480b34bf4f7fe4a7db898 * update patches * WillCreateURLLoaderFactory now gets a ukm_source_id Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2346803 * ink_drop_visible_opacity -> GetInkDropVisibleOpacity Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2415368 * chore: bump chromium in DEPS to ddb5b6db5e35ab1a7b5adbd9f15373af6c35ea2a * 2418471: PDF Viewer update: Add missing aria-labels to various buttons. https://chromium-review.googlesource.com/c/chromium/src/+/2418471 * update printing.patch given print settings mojoification Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2409467 * update patches * content::BluetoothChooser::Event -> content::BluetoothChooserEvent Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2387901 * set_ink_drop_base_color -> SetInkDropBaseColor Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2419388 * chore: bump chromium in DEPS to ecf7c9ee830d4d85f300b461a2fa13aa40c79a4c * update patches * gfx::ConvertPointToPixel -> gfx::ConvertPointToPixels Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2418568 * remove ContentSettingsObserver::AllowStorage() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2401847 * service_manager::kCrashDumpSignal -> kCrashDumpSignal Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2417073 * chore: bump chromium in DEPS to abdb7ebe5f8c8328b8f435283df90d0a3ecff7bd * chore: bump chromium in DEPS to 2a7e138ab1066534ceb2622e8a9d2c8ebf574215 * chore: bump chromium in DEPS to ab1884e75ced904e4276851eb4e1ad89919ca93b * chore: bump chromium in DEPS to a12413902380dcc2a73ac74d582328280a8af686 * Fixup printing patch https://chromium-review.googlesource.com/c/chromium/src/+/2428623 * Fixup OSR patch https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Make ExtensionURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2357523 * Add deprecated_default_sources_assignment_filter variable https://chromium-review.googlesource.com/c/chromium/src/+/2416496 * Fixup patch indices * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * chore: bump chromium in DEPS to 378450342cf6aa160663d0ce3a178a11b570c25a * Fixup patch indices * Remove SurfaceEmbeddingTime and LocalSurfaceIdAllocation https://chromium-review.googlesource.com/c/chromium/src/+/2415128 * Add DragOperation and AllowedDragOperations Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/2196167 * 2426564: Remove global sources assignment filter value https://chromium-review.googlesource.com/c/chromium/src/+/2426564 * Fixup blink_local_frame.patch * [XProto] Remove a subset of ui/gfx/x/x11.h https://chromium-review.googlesource.com/c/chromium/src/+/2430328 * Fixup patch indices * Remove several references to BrowserPlugin from content https://chromium-review.googlesource.com/c/chromium/src/+/2401031 * Remove lossy ConvertSizeToPixel() methods https://chromium-review.googlesource.com/c/chromium/src/+/2419534 * serial: Use USB driver name to disambiguate ports https://chromium-review.googlesource.com/c/chromium/src/+/2413176 * Remove set_sources_filter import * Fix ModMask usage * [XProto] Remove usage of all Xlib headers https://chromium-review.googlesource.com/c/chromium/src/+/2392140 * [XProto] Remove usage of Xlib Visuals https://chromium-review.googlesource.com/c/chromium/src/+/2429933 * Skip Angle manifest file https://chromium-review.googlesource.com/c/angle/angle/+/2425197 * Add whole src\third_party\angle\.git directory This directory is needed in order to properly generate gen/angle/angle_commit.h * [libvpx] Fix HighBD config on Windows ARM64 https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * update patches * fix: correct calling convention for Windows on Arm https://chromium-review.googlesource.com/c/v8/v8/+/2440717 * Add third_party/angle/.git to the archive before adding the rest of the source * fixup source caching on Windows * Fixup erroneous close paren * fixup for goma issues * This should work * chore: bump chromium roll manually https://chromium-review.googlesource.com/c/chromium/src/+/2435142 This landed the day after we paused roller-bot and may resolve the visibility test flakes that we're seeing. h/t to @jkleinsc for finding this with me. * chore: remove obsoleted cherry-pick fix for libvpx https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * chore: remove obsoleted cherry-pick libvpx patch https://chromium-review.googlesource.com/c/chromium/src/+/2437745 * chore: re-export patches * chore: add tracer comment to visibility-stat-spec. The line numbers between the source and the CI runs don't seem to match up, so this temp tracer is to help track the source of that difference. * chore: bump chromium in DEPS to 7c2b8cc3b8638aee8abeb013042a6c1d15b2da6b * update patches * impl SortingLSH service Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2425327 * 2446525: [Flash] Remove some Flash APIs https://chromium-review.googlesource.com/c/chromium/src/+/2446525 * 2440974: Reland "Delete service_manager/embedder/switches.h" https://chromium-review.googlesource.com/c/chromium/src/+/2440974 * 2359402: Remove ContentBrowserClient::NonNetworkURLLoaderFactoryDeprecatedMap. https://chromium-review.googlesource.com/c/chromium/src/+/2359402 * 2250506: Implement tabs.removeCSS https://chromium-review.googlesource.com/c/chromium/src/+/2250506 * 2429143: Remove implicit-conversion-to-integer ConvertRectToPixel() methods. https://chromium-review.googlesource.com/c/chromium/src/+/2429143 * 2444430: Remove DataElementType::kBlob https://chromium-review.googlesource.com/c/chromium/src/+/2444430 * 2441964: Clean up WebView public API https://chromium-review.googlesource.com/c/chromium/src/+/2441964 * 2357523: Make ExtensionURLLoaderFactory always owned by its |receivers_|. https://chromium-review.googlesource.com/c/chromium/src/+/2357523 * 2461606: Use blink::mojom::PreferredColorScheme instead of blink::PreferredColorScheme https://chromium-review.googlesource.com/c/chromium/src/+/2461606 * 2461235: a11y inspect reorg: move PropertyFilter struct to a new location https://chromium-review.googlesource.com/c/chromium/src/+/2461235 * remove flash support * fix frame_host_manager patch * fix lint * remove flash info from docs * fix build * fix osr * chore: bump chromium in DEPS to 9269f9eb1d98d29564c2b2ab97f30c6e148c4e11 * fix visibilityState tests * 2463049: Replace all uses of web_pref::AutoplayPolicy with mojom::AutoplayPolicy https://chromium-review.googlesource.com/c/chromium/src/+/2463049 * update patches * fix tests harder * 2414921: Add Group and Ungroup functions to Tabs extension API https://chromium-review.googlesource.com/c/chromium/src/+/2414921 * more test fix * Remove all keyboard related usage of Xlib Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2436787 * fix linux build * 2453807: [XProto] Remove usage of Xlib error handling https://chromium-review.googlesource.com/c/chromium/src/+/2453807 * lint * fixup! 2453807: [XProto] Remove usage of Xlib error handling * disable CalculateNativeWinOcclusion on win ci * remove UploadBlob from docs * Update appveyor.yml Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
131 lines
4.1 KiB
C++
131 lines
4.1 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/lib/bluetooth_chooser.h"
|
|
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<electron::BluetoothChooser::DeviceInfo> {
|
|
static v8::Local<v8::Value> ToV8(
|
|
v8::Isolate* isolate,
|
|
const electron::BluetoothChooser::DeviceInfo& val) {
|
|
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.Set("deviceName", val.device_name);
|
|
dict.Set("deviceId", val.device_id);
|
|
return gin::ConvertToV8(isolate, dict);
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
const int kMaxScanRetries = 5;
|
|
|
|
void OnDeviceChosen(const content::BluetoothChooser::EventHandler& handler,
|
|
const std::string& device_id) {
|
|
if (device_id.empty()) {
|
|
handler.Run(content::BluetoothChooserEvent::CANCELLED, device_id);
|
|
} else {
|
|
handler.Run(content::BluetoothChooserEvent::SELECTED, device_id);
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
BluetoothChooser::BluetoothChooser(api::WebContents* contents,
|
|
const EventHandler& event_handler)
|
|
: api_web_contents_(contents), event_handler_(event_handler) {}
|
|
|
|
BluetoothChooser::~BluetoothChooser() = default;
|
|
|
|
void BluetoothChooser::SetAdapterPresence(AdapterPresence presence) {
|
|
switch (presence) {
|
|
case AdapterPresence::ABSENT:
|
|
case AdapterPresence::POWERED_OFF:
|
|
event_handler_.Run(content::BluetoothChooserEvent::CANCELLED, "");
|
|
break;
|
|
case AdapterPresence::POWERED_ON:
|
|
break;
|
|
}
|
|
}
|
|
|
|
void BluetoothChooser::ShowDiscoveryState(DiscoveryState state) {
|
|
switch (state) {
|
|
case DiscoveryState::FAILED_TO_START:
|
|
event_handler_.Run(content::BluetoothChooserEvent::CANCELLED, "");
|
|
break;
|
|
case DiscoveryState::IDLE:
|
|
if (device_map_.empty()) {
|
|
auto event = ++num_retries_ > kMaxScanRetries
|
|
? content::BluetoothChooserEvent::CANCELLED
|
|
: content::BluetoothChooserEvent::RESCAN;
|
|
event_handler_.Run(event, "");
|
|
} else {
|
|
bool prevent_default = api_web_contents_->Emit(
|
|
"select-bluetooth-device", GetDeviceList(),
|
|
base::BindOnce(&OnDeviceChosen, event_handler_));
|
|
if (!prevent_default) {
|
|
auto it = device_map_.begin();
|
|
auto device_id = it->first;
|
|
event_handler_.Run(content::BluetoothChooserEvent::SELECTED,
|
|
device_id);
|
|
}
|
|
}
|
|
break;
|
|
case DiscoveryState::DISCOVERING:
|
|
break;
|
|
}
|
|
}
|
|
|
|
void BluetoothChooser::AddOrUpdateDevice(const std::string& device_id,
|
|
bool should_update_name,
|
|
const base::string16& device_name,
|
|
bool is_gatt_connected,
|
|
bool is_paired,
|
|
int signal_strength_level) {
|
|
bool changed = false;
|
|
auto entry = device_map_.find(device_id);
|
|
if (entry == device_map_.end()) {
|
|
device_map_[device_id] = device_name;
|
|
changed = true;
|
|
} else if (should_update_name) {
|
|
entry->second = device_name;
|
|
changed = true;
|
|
}
|
|
|
|
if (changed) {
|
|
// Emit a select-bluetooth-device handler to allow for user to listen for
|
|
// bluetooth device found.
|
|
bool prevent_default = api_web_contents_->Emit(
|
|
"select-bluetooth-device", GetDeviceList(),
|
|
base::BindOnce(&OnDeviceChosen, event_handler_));
|
|
|
|
// If emit not implimented select first device that matches the filters
|
|
// provided.
|
|
if (!prevent_default) {
|
|
event_handler_.Run(content::BluetoothChooserEvent::SELECTED, device_id);
|
|
}
|
|
}
|
|
}
|
|
|
|
std::vector<electron::BluetoothChooser::DeviceInfo>
|
|
BluetoothChooser::GetDeviceList() {
|
|
std::vector<electron::BluetoothChooser::DeviceInfo> vec;
|
|
vec.reserve(device_map_.size());
|
|
for (const auto& it : device_map_) {
|
|
DeviceInfo info = {it.first, it.second};
|
|
vec.push_back(info);
|
|
}
|
|
|
|
return vec;
|
|
}
|
|
|
|
} // namespace electron
|