|
|
@@ -10,7 +10,7 @@ diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b
|
|
|
index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa0481551d 100644
|
|
|
--- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm
|
|
|
+++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
|
|
|
-@@ -341,11 +341,13 @@ AccessibilityTreeFormatterMac::ParamByPropertyNode(
|
|
|
+@@ -341,11 +341,13 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
|
|
|
param = PropertyNodeToRange(property_node);
|
|
|
} else if (property_name == "AXIndexForChildUIElement") { // UIElement
|
|
|
param = PropertyNodeToUIElement(property_node, line_indexes_map);
|
|
|
@@ -24,7 +24,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
|
|
|
}
|
|
|
|
|
|
return param;
|
|
|
-@@ -433,6 +435,7 @@ AccessibilityTreeFormatterMac::PropertyNodeToUIElement(
|
|
|
+@@ -433,6 +435,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
|
|
|
return uielement;
|
|
|
}
|
|
|
|
|
|
@@ -32,7 +32,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
|
|
|
id AccessibilityTreeFormatterMac::DictNodeToTextMarker(
|
|
|
const PropertyNode& dictnode,
|
|
|
const LineIndexesMap& line_indexes_map) const {
|
|
|
-@@ -512,6 +515,7 @@ id AccessibilityTreeFormatterMac::PropertyNodeToTextMarkerRange(
|
|
|
+@@ -512,6 +515,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
|
|
|
|
|
|
return content::AXTextMarkerRangeFrom(anchor_textmarker, focus_textmarker);
|
|
|
}
|
|
|
@@ -40,7 +40,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
|
|
|
|
|
|
base::Value AccessibilityTreeFormatterMac::PopulateSize(
|
|
|
const BrowserAccessibilityCocoa* cocoa_node) const {
|
|
|
-@@ -573,7 +577,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject(
|
|
|
+@@ -573,7 +577,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
|
|
|
0 == strcmp([value objCType], @encode(NSRange))) {
|
|
|
return PopulateRange([value rangeValue]);
|
|
|
}
|
|
|
@@ -49,7 +49,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
|
|
|
// AXTextMarker
|
|
|
if (content::IsAXTextMarker(value)) {
|
|
|
return PopulateTextPosition(content::AXTextMarkerToPosition(value).get(),
|
|
|
-@@ -584,7 +588,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject(
|
|
|
+@@ -584,7 +588,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
|
|
|
if (content::IsAXTextMarkerRange(value)) {
|
|
|
return PopulateTextMarkerRange(value, line_indexes_map);
|
|
|
}
|
|
|
@@ -58,7 +58,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
|
|
|
// Accessible object
|
|
|
if ([value isKindOfClass:[BrowserAccessibilityCocoa class]]) {
|
|
|
return base::Value(NodeToLineIndex(value, line_indexes_map));
|
|
|
-@@ -635,7 +639,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextPosition(
|
|
|
+@@ -635,7 +639,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
|
|
|
kConstValuePrefix + affinity);
|
|
|
return set;
|
|
|
}
|
|
|
@@ -67,7 +67,7 @@ index 6074fd6fb7da7c0e927fa81e8095729349520417..d6e93ab7cea23fe9592110967a1c9cfa
|
|
|
base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange(
|
|
|
id object,
|
|
|
const LineIndexesMap& line_indexes_map) const {
|
|
|
-@@ -650,7 +654,7 @@ base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange(
|
|
|
+@@ -650,7 +654,7 @@ id PropertyNodeToTextMarkerRange(const PropertyNode&,
|
|
|
dict.SetPath("focus", PopulateTextPosition(range.focus(), line_indexes_map));
|
|
|
return dict;
|
|
|
}
|
|
|
@@ -123,7 +123,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/cont
|
|
|
index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d91772acc7d9d 100644
|
|
|
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
|
|
|
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
|
|
|
-@@ -208,6 +208,7 @@ NSString* const
|
|
|
+@@ -208,6 +208,7 @@
|
|
|
NSString* const NSAccessibilityLengthForTextMarkerRangeParameterizedAttribute =
|
|
|
@"AXLengthForTextMarkerRange";
|
|
|
|
|
|
@@ -131,7 +131,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
// Private attributes that can be used for testing text markers, e.g. in dump
|
|
|
// tree tests.
|
|
|
NSString* const
|
|
|
-@@ -219,6 +220,7 @@ NSString* const
|
|
|
+@@ -219,6 +220,7 @@
|
|
|
NSString* const
|
|
|
NSAccessibilityTextMarkerNodeDebugDescriptionParameterizedAttribute =
|
|
|
@"AXTextMarkerNodeDebugDescription";
|
|
|
@@ -139,7 +139,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
|
|
|
// Other private attributes.
|
|
|
NSString* const NSAccessibilitySelectTextWithCriteriaParameterizedAttribute =
|
|
|
-@@ -242,6 +244,7 @@ NSDictionary* attributeToMethodNameMap = nil;
|
|
|
+@@ -242,6 +244,7 @@
|
|
|
// VoiceOver uses -1 to mean "no limit" for AXResultsLimit.
|
|
|
const int kAXResultsLimitNoLimit = -1;
|
|
|
|
|
|
@@ -147,7 +147,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
extern "C" {
|
|
|
|
|
|
// The following are private accessibility APIs required for cursor navigation
|
|
|
-@@ -470,6 +473,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange(id marker_range) {
|
|
|
+@@ -470,6 +473,7 @@ void AddMisspelledTextAttributes(const AXPlatformRange& ax_range,
|
|
|
AddMisspelledTextAttributes(ax_range, attributed_text);
|
|
|
return attributed_text;
|
|
|
}
|
|
|
@@ -155,7 +155,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
|
|
|
// Returns an autoreleased copy of the AXNodeData's attribute.
|
|
|
NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility,
|
|
|
-@@ -727,6 +731,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
|
|
|
+@@ -727,6 +731,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
|
|
|
#define NSAccessibilityLanguageAttribute @"AXLanguage"
|
|
|
#endif
|
|
|
|
|
|
@@ -163,7 +163,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
bool content::IsAXTextMarker(id object) {
|
|
|
if (object == nil)
|
|
|
return false;
|
|
|
-@@ -770,6 +775,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -770,6 +775,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
|
|
|
kCFAllocatorDefault, anchor_textmarker, focus_textmarker);
|
|
|
return [static_cast<id>(cf_marker_range) autorelease];
|
|
|
}
|
|
|
@@ -171,7 +171,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
|
|
|
@implementation BrowserAccessibilityCocoa
|
|
|
|
|
|
-@@ -807,7 +813,9 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -807,7 +813,9 @@ + (void)initialize {
|
|
|
{NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
|
|
|
{NSAccessibilityElementBusyAttribute, @"elementBusy"},
|
|
|
{NSAccessibilityEnabledAttribute, @"enabled"},
|
|
|
@@ -181,7 +181,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
{NSAccessibilityExpandedAttribute, @"expanded"},
|
|
|
{NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"},
|
|
|
{NSAccessibilityFocusedAttribute, @"focused"},
|
|
|
-@@ -819,8 +827,10 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -819,8 +827,10 @@ + (void)initialize {
|
|
|
{NSAccessibilityHighestEditableAncestorAttribute,
|
|
|
@"highestEditableAncestor"},
|
|
|
{NSAccessibilityIndexAttribute, @"index"},
|
|
|
@@ -192,7 +192,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
{NSAccessibilityInvalidAttribute, @"invalid"},
|
|
|
{NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"},
|
|
|
{NSAccessibilityLanguageAttribute, @"language"},
|
|
|
-@@ -842,13 +852,17 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -842,13 +852,17 @@ + (void)initialize {
|
|
|
{NSAccessibilityRowsAttribute, @"rows"},
|
|
|
// TODO(aboxhall): expose
|
|
|
// NSAccessibilityServesAsTitleForUIElementsAttribute
|
|
|
@@ -210,7 +210,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
{NSAccessibilitySizeAttribute, @"size"},
|
|
|
{NSAccessibilitySortDirectionAttribute, @"sortDirection"},
|
|
|
{NSAccessibilitySubroleAttribute, @"subrole"},
|
|
|
-@@ -1336,6 +1350,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -1336,6 +1350,7 @@ - (NSNumber*)enabled {
|
|
|
ax::mojom::Restriction::kDisabled];
|
|
|
}
|
|
|
|
|
|
@@ -218,7 +218,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
// Returns a text marker that points to the last character in the document that
|
|
|
// can be selected with VoiceOver.
|
|
|
- (id)endTextMarker {
|
|
|
-@@ -1346,6 +1361,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -1346,6 +1361,7 @@ - (id)endTextMarker {
|
|
|
BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
|
|
|
return CreateTextMarker(position->CreatePositionAtEndOfAnchor());
|
|
|
}
|
|
|
@@ -226,7 +226,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
|
|
|
- (NSNumber*)expanded {
|
|
|
if (![self instanceActive])
|
|
|
-@@ -1495,6 +1511,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -1495,6 +1511,8 @@ - (NSNumber*)index {
|
|
|
return nil;
|
|
|
}
|
|
|
|
|
|
@@ -235,7 +235,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
- (NSNumber*)insertionPointLineNumber {
|
|
|
if (![self instanceActive])
|
|
|
return nil;
|
|
|
-@@ -1517,6 +1535,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -1517,6 +1535,7 @@ - (NSNumber*)insertionPointLineNumber {
|
|
|
caretPosition->AsTextPosition()->text_offset());
|
|
|
return @(std::distance(lineBreaks.begin(), iterator));
|
|
|
}
|
|
|
@@ -243,7 +243,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
|
|
|
// Returns whether or not this node should be ignored in the
|
|
|
// accessibility tree.
|
|
|
-@@ -2193,6 +2212,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -2193,6 +2212,7 @@ - (NSArray*)selectedChildren {
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
@@ -251,7 +251,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
- (NSString*)selectedText {
|
|
|
if (![self instanceActive])
|
|
|
return nil;
|
|
|
-@@ -2204,11 +2224,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -2204,11 +2224,13 @@ - (NSString*)selectedText {
|
|
|
return nil;
|
|
|
return base::SysUTF16ToNSString(range.GetText());
|
|
|
}
|
|
|
@@ -265,7 +265,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
- (NSValue*)selectedTextRange {
|
|
|
if (![self instanceActive])
|
|
|
return nil;
|
|
|
-@@ -2229,12 +2251,15 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -2229,12 +2251,15 @@ - (NSValue*)selectedTextRange {
|
|
|
int selLength = range.GetText().length();
|
|
|
return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
|
|
|
}
|
|
|
@@ -281,7 +281,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
|
|
|
- (NSValue*)size {
|
|
|
if (![self instanceActive])
|
|
|
-@@ -2267,6 +2292,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -2267,6 +2292,7 @@ - (NSString*)sortDirection {
|
|
|
return nil;
|
|
|
}
|
|
|
|
|
|
@@ -289,7 +289,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
// Returns a text marker that points to the first character in the document that
|
|
|
// can be selected with VoiceOver.
|
|
|
- (id)startTextMarker {
|
|
|
-@@ -2277,6 +2303,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -2277,6 +2303,7 @@ - (id)startTextMarker {
|
|
|
BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
|
|
|
return CreateTextMarker(position->CreatePositionAtStartOfAnchor());
|
|
|
}
|
|
|
@@ -297,7 +297,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
|
|
|
// Returns a subrole based upon the role.
|
|
|
- (NSString*)subrole {
|
|
|
-@@ -2599,11 +2626,13 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -2599,11 +2626,13 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
|
|
|
NSMutableAttributedString* attributedInnerText =
|
|
|
[[[NSMutableAttributedString alloc]
|
|
|
initWithString:base::SysUTF16ToNSString(innerText)] autorelease];
|
|
|
@@ -311,7 +311,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
|
|
|
return [attributedInnerText attributedSubstringFromRange:range];
|
|
|
}
|
|
|
-@@ -2707,9 +2736,8 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -2707,9 +2736,8 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
|
|
|
return ToBrowserAccessibilityCocoa(cell);
|
|
|
}
|
|
|
|
|
|
@@ -323,7 +323,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
BrowserAccessibilityPositionInstance position =
|
|
|
CreatePositionFromTextMarker(parameter);
|
|
|
if (!position->IsNullPosition())
|
|
|
-@@ -3022,6 +3050,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -3022,6 +3050,7 @@ AXPlatformRange range(std::move(lineStartPosition),
|
|
|
|
|
|
return CreateTextMarker(root->CreatePositionAt(index));
|
|
|
}
|
|
|
@@ -331,7 +331,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
|
|
|
if ([attribute isEqualToString:
|
|
|
NSAccessibilityBoundsForRangeParameterizedAttribute]) {
|
|
|
-@@ -3057,6 +3086,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -3057,6 +3086,7 @@ AXPlatformRange range(std::move(lineStartPosition),
|
|
|
return nil;
|
|
|
}
|
|
|
|
|
|
@@ -339,7 +339,7 @@ index 474ae88c323e9a10bd8486482507f0d749214963..090c8fdc3b374ed937d3e04ccd5d9177
|
|
|
if ([attribute
|
|
|
isEqualToString:
|
|
|
NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
|
|
|
-@@ -3171,6 +3201,7 @@ id content::AXTextMarkerRangeFrom(id anchor_textmarker, id focus_textmarker) {
|
|
|
+@@ -3171,6 +3201,7 @@ AXPlatformRange range(std::move(lineStartPosition),
|
|
|
|
|
|
return @(child->GetIndexInParent());
|
|
|
}
|
|
|
@@ -351,7 +351,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
|
index aaf53dd214037f103ea7399d0702b1e2ffff1b56..5972939a070908521e82845b084d2d3b9f9a73f8 100644
|
|
|
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
|
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
|
|
|
-@@ -527,6 +527,7 @@ NSDictionary* BrowserAccessibilityManagerMac::
|
|
|
+@@ -527,6 +527,7 @@ void PostAnnouncementNotification(NSString* announcement) {
|
|
|
[user_info setObject:native_focus_object
|
|
|
forKey:NSAccessibilityTextChangeElement];
|
|
|
|
|
|
@@ -359,7 +359,7 @@ index aaf53dd214037f103ea7399d0702b1e2ffff1b56..5972939a070908521e82845b084d2d3b
|
|
|
id selected_text = [native_focus_object selectedTextMarkerRange];
|
|
|
if (selected_text) {
|
|
|
NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
|
|
|
-@@ -534,6 +535,7 @@ NSDictionary* BrowserAccessibilityManagerMac::
|
|
|
+@@ -534,6 +535,7 @@ void PostAnnouncementNotification(NSString* announcement) {
|
|
|
[user_info setObject:selected_text
|
|
|
forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
|
|
|
}
|
|
|
@@ -383,7 +383,7 @@ index 28ca1646af0b0cce40d27baec71cbe65adc334fa..bae65c1f485bc02eb9ef2ebf7018af4a
|
|
|
|
|
|
namespace content {
|
|
|
|
|
|
-@@ -22,6 +24,7 @@ namespace {
|
|
|
+@@ -22,6 +24,7 @@
|
|
|
// verifies there are no existing open connections), and then indicates that
|
|
|
// Chrome should continue execution without access to launchservicesd.
|
|
|
void DisableSystemServices() {
|
|
|
@@ -411,7 +411,7 @@ index 3aec8bc1fe1a619f2c4ec42ef438ae49fe0f5812..76dc23dfa26beb3b92bd87eb60fe3868
|
|
|
extern "C" {
|
|
|
// Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and
|
|
|
// `Karabiner` [3] to programmatically control the Bluetooth state. Calling the
|
|
|
-@@ -49,6 +50,7 @@ extern "C" {
|
|
|
+@@ -49,6 +50,7 @@
|
|
|
// [4] https://support.apple.com/kb/PH25091
|
|
|
void IOBluetoothPreferenceSetControllerPowerState(int state);
|
|
|
}
|
|
|
@@ -419,7 +419,7 @@ index 3aec8bc1fe1a619f2c4ec42ef438ae49fe0f5812..76dc23dfa26beb3b92bd87eb60fe3868
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
-@@ -118,8 +120,10 @@ BluetoothAdapterMac::BluetoothAdapterMac()
|
|
|
+@@ -118,8 +120,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) {
|
|
|
controller_state_function_(
|
|
|
base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState,
|
|
|
base::Unretained(this))),
|
|
|
@@ -430,7 +430,7 @@ index 3aec8bc1fe1a619f2c4ec42ef438ae49fe0f5812..76dc23dfa26beb3b92bd87eb60fe3868
|
|
|
should_update_name_(true),
|
|
|
classic_discovery_manager_(
|
|
|
BluetoothDiscoveryManagerMac::CreateClassic(this)),
|
|
|
-@@ -306,8 +310,12 @@ base::WeakPtr<BluetoothAdapter> BluetoothAdapterMac::GetWeakPtr() {
|
|
|
+@@ -306,8 +310,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) {
|
|
|
}
|
|
|
|
|
|
bool BluetoothAdapterMac::SetPoweredImpl(bool powered) {
|
Samuel Attard