diff --git chrome/browser/extensions/api/chrome_extensions_api_client.cc chrome/browser/extensions/api/chrome_extensions_api_client.cc index 4007e26f780c3..26d0d492cf176 100644 --- chrome/browser/extensions/api/chrome_extensions_api_client.cc +++ chrome/browser/extensions/api/chrome_extensions_api_client.cc @@ -14,6 +14,7 @@ #include "base/strings/string_util.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" +#include "cef/libcef/features/features.h" #include "chrome/browser/extensions/api/automation_internal/chrome_automation_internal_api_delegate.h" #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h" #include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h" @@ -92,6 +93,10 @@ #include "chrome/browser/extensions/clipboard_extension_helper_chromeos.h" #endif +#if BUILDFLAG(ENABLE_CEF) +#include "cef/libcef/browser/chrome/extensions/chrome_mime_handler_view_guest_delegate_cef.h" +#endif + #if BUILDFLAG(ENABLE_PRINTING) #include "chrome/browser/printing/printing_init.h" #endif @@ -314,7 +319,11 @@ ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate() const { std::unique_ptr ChromeExtensionsAPIClient::CreateMimeHandlerViewGuestDelegate( MimeHandlerViewGuest* guest) const { +#if BUILDFLAG(ENABLE_CEF) + return std::make_unique(guest); +#else return std::make_unique(); +#endif } WebViewGuestDelegate* ChromeExtensionsAPIClient::CreateWebViewGuestDelegate( diff --git chrome/browser/extensions/api/tabs/tabs_api.cc chrome/browser/extensions/api/tabs/tabs_api.cc index 73de5dd73a522..12005b67a6ee9 100644 --- chrome/browser/extensions/api/tabs/tabs_api.cc +++ chrome/browser/extensions/api/tabs/tabs_api.cc @@ -1553,7 +1553,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() { if (DevToolsWindow::IsDevToolsWindow(contents)) return RespondNow(Error(tabs_constants::kNotAllowedForDevToolsError)); - if (!ExtensionTabUtil::BrowserSupportsTabs(browser)) + if (browser && !ExtensionTabUtil::BrowserSupportsTabs(browser)) return RespondNow(Error(tabs_constants::kNoCurrentWindowError)); web_contents_ = contents; @@ -1577,7 +1577,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() { return RespondNow(Error(tabs_constants::kTabStripNotEditableError)); } - if (tab_strip->active_index() != tab_index) { + if (tab_strip && tab_strip->active_index() != tab_index) { tab_strip->ActivateTabAt(tab_index); DCHECK_EQ(contents, tab_strip->GetActiveWebContents()); } @@ -1591,7 +1591,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() { } bool highlighted = *params->update_properties.highlighted; - if (highlighted != tab_strip->IsTabSelected(tab_index)) { + if (tab_strip && highlighted != tab_strip->IsTabSelected(tab_index)) { tab_strip->ToggleSelectionAt(tab_index); } } @@ -1604,7 +1604,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() { base::NumberToString(tab_id)))); } - if (params->update_properties.opener_tab_id) { + if (tab_strip && params->update_properties.opener_tab_id) { int opener_id = *params->update_properties.opener_tab_id; WebContents* opener_contents = nullptr; if (opener_id == tab_id) { @@ -1639,11 +1639,11 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() { } const bool contents_in_an_uneditable_saved_group = - contents && ExtensionTabUtil::TabIsInSavedTabGroup( + browser && contents && ExtensionTabUtil::TabIsInSavedTabGroup( web_contents_, browser->tab_strip_model()) && !ExtensionHasLockedFullscreenPermission(extension()); - if (params->update_properties.pinned) { + if (tab_strip && params->update_properties.pinned) { // Pinning will result in changes to the tabs index/group affiliation in // some cases, Throw an error if a tab is attempting to be pinned. if (contents_in_an_uneditable_saved_group) { @@ -1674,8 +1674,9 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() { } std::string updated_url = *params->update_properties.url; - if (browser->profile()->IsIncognitoProfile() && - !IsURLAllowedInIncognito(GURL(updated_url), browser->profile())) { + auto* profile = Profile::FromBrowserContext(browser_context()); + if (profile->IsIncognitoProfile() && + !IsURLAllowedInIncognito(GURL(updated_url), profile)) { return RespondNow(Error(ErrorUtils::FormatErrorMessage( tabs_constants::kURLsNotAllowedInIncognitoError, updated_url))); } @@ -1689,7 +1690,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() { return RespondNow(Error(std::move(error))); } - NotifyExtensionTelemetry(Profile::FromBrowserContext(browser_context()), + NotifyExtensionTelemetry(profile, extension(), safe_browsing::TabsApiInfo::UPDATE, current_url, updated_url, js_callstack()); } diff --git chrome/browser/extensions/extension_tab_util.cc chrome/browser/extensions/extension_tab_util.cc index 46154f4501a36..81adec54cee06 100644 --- chrome/browser/extensions/extension_tab_util.cc +++ chrome/browser/extensions/extension_tab_util.cc @@ -18,6 +18,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/types/expected_macros.h" +#include "cef/libcef/features/features.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/tab_groups/tab_groups_util.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" @@ -73,6 +74,10 @@ #include "third_party/blink/public/common/features.h" #include "url/gurl.h" +#if BUILDFLAG(ENABLE_CEF) +#include "cef/libcef/browser/chrome/extensions/chrome_extension_util.h" +#endif + using content::NavigationEntry; using content::WebContents; using extensions::mojom::APIPermissionID; @@ -763,6 +768,20 @@ bool ExtensionTabUtil::GetTabById(int tab_id, } } +#if BUILDFLAG(ENABLE_CEF) + if (cef::GetAlloyTabById(tab_id, profile, include_incognito, contents)) { + // |tab_strip| and |tab_index| are tied to a specific Browser window, which + // doesn't exist for an Alloy style browser. + if (tab_strip) { + *tab_strip = nullptr; + } + if (tab_index) { + *tab_index = api::tabs::TAB_INDEX_NONE; + } + return true; + } +#endif // BUILDFLAG(ENABLE_CEF) + if (base::FeatureList::IsEnabled(blink::features::kPrerender2InNewTab)) { // Prerendering tab is not visible and it cannot be in `TabStripModel`, if // the tab id exists as a prerendering tab, and the API will returns diff --git chrome/browser/ui/tab_helpers.h chrome/browser/ui/tab_helpers.h index 4ca4ecd147267..dc8a8d004a1d6 100644 --- chrome/browser/ui/tab_helpers.h +++ chrome/browser/ui/tab_helpers.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_TAB_HELPERS_H_ #include "build/build_config.h" +#include "cef/libcef/features/features.h" #if BUILDFLAG(IS_ANDROID) @@ -37,6 +38,10 @@ namespace prerender { class ChromeNoStatePrefetchContentsDelegate; } +#if BUILDFLAG(ENABLE_CEF) +class CefBrowserPlatformDelegateAlloy; +#endif + // A "tab contents" is a WebContents that is used as a tab in a browser window // (or the equivalent on Android). The TabHelpers class allows specific classes // to attach the set of tab helpers that is used for tab contents. @@ -74,6 +79,10 @@ class TabHelpers { // Link Preview shows a preview of a page, then promote it as a new tab. friend class PreviewTab; +#if BUILDFLAG(ENABLE_CEF) + friend class CefBrowserPlatformDelegateAlloy; +#endif + // FYI: Do NOT add any more friends here. The functions above are the ONLY // ones that need to call AttachTabHelpers; if you think you do, re-read the // design document linked above, especially the section "Reusing tab helpers". diff --git chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc index b9bca4946ef9f..41207ebb86045 100644 --- chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc +++ chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc @@ -830,6 +830,10 @@ void DownloadToolbarButtonView::ShowPendingDownloadStartedAnimation() { if (!gfx::Animation::ShouldRenderRichAnimation()) { return; } + if (!IsDrawn()) { + // Don't animate with a hidden download button. + return; + } content::WebContents* const web_contents = browser_->tab_strip_model()->GetActiveWebContents(); if (!web_contents ||