diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc')
-rw-r--r-- | www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc index 4ea9f3758e34..b766698ee952 100644 --- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc +++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc @@ -1,20 +1,29 @@ ---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc -@@ -11,7 +11,7 @@ - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/send_tab_to_self/receiving_ui_handler.h" +@@ -13,7 +13,7 @@ + #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_button_controller.h" + #include "components/send_tab_to_self/features.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ defined(OS_WIN) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #endif -@@ -33,7 +33,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry +@@ -35,7 +35,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry // Instantiates all the handlers relevant to this platform. void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers( Profile* profile) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ defined(OS_WIN) - applicable_handlers_.push_back( - std::make_unique<send_tab_to_self::DesktopNotificationHandler>(profile)); + + // If STTS 2.0 is enabled the handler will be created when the toolbar +@@ -54,7 +54,7 @@ void ReceivingUiHandlerRegistry::InstantiatePlatformSp + SendTabToSelfToolbarButtonController* + ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile( + Profile* profile) { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) + for (const std::unique_ptr<ReceivingUiHandler>& handler : + applicable_handlers_) { |