mirror of
https://github.com/zen-browser/desktop.git
synced 2026-01-06 21:37:50 +00:00
Merge branch 'haptic-feedback' of https://github.com/zen-browser/desktop into haptic-feedback
This commit is contained in:
@@ -1075,6 +1075,7 @@
|
||||
indicator.style.left = left;
|
||||
indicator.style.removeProperty('top');
|
||||
}
|
||||
Services.zen.playHapticFeedback(/*soft*/3);
|
||||
}
|
||||
|
||||
async onTabLabelChanged(tab) {
|
||||
|
||||
@@ -57,14 +57,12 @@ using mozilla::dom::WindowGlobalChild;
|
||||
*canShare = false; \
|
||||
return NS_OK;
|
||||
|
||||
#ifdef XP_MACOSX
|
||||
NS_IMETHODIMP
|
||||
ZenCommonUtils::PlayHapticFeedback(uint32_t type) {
|
||||
// We don't have any haptic feedback on non-macOS platforms
|
||||
// so we can just return.
|
||||
return PlayHapticFeedbackInternal(type);
|
||||
}
|
||||
#endif
|
||||
|
||||
NS_IMETHODIMP
|
||||
ZenCommonUtils::CanShare(bool* canShare) {
|
||||
@@ -107,7 +105,7 @@ nsresult ZenCommonUtils::ShareInternal(nsCOMPtr<mozIDOMWindowProxy>& aWindow, ns
|
||||
auto ZenCommonUtils::IsSharingSupported() -> bool {
|
||||
#if defined(XP_WIN) && !defined(__MINGW32__)
|
||||
// The first public build that supports ShareCanceled API
|
||||
return IsWindows10BuildOrLater(18956);
|
||||
return mozilla::IsWindows10BuildOrLater(18956);
|
||||
#elif defined(NS_ZEN_CAN_SHARE_NATIVE)
|
||||
return NS_ZEN_CAN_SHARE_NATIVE;
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user