Thorium_Archive/thorium-mirror
1
0
Fork 0
mirror of https://github.com/Alex313031/thorium.git synced 2025-01-10 03:47:44 -03:00
Code Issues Projects Releases Packages Wiki Activity

Update browser_view.cc

Browse source
This commit is contained in:
Alexander David Frick 2022-08-02 06:58:41 -05:00 committed by GitHub
parent 9779ee562f
commit db8970d55a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/chrome/browser/ui/views/frame/browser_view.cc
View file

@ -152,6 +152,7 @@
#include "chrome/browser/ui/views/tabs/tab.h"
#include "chrome/browser/ui/views/tabs/tab_search_button.h"
#include "chrome/browser/ui/views/tabs/tab_strip.h"
#include "chrome/browser/ui/views/theme_copying_widget.h"
#include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h"
#include "chrome/browser/ui/views/toolbar/reload_button.h"
#include "chrome/browser/ui/views/toolbar/toolbar_account_icon_container_view.h"
@ -2361,8 +2362,12 @@ bool BrowserView::IsToolbarVisible() const {
show_fullscreen_toolbar = browser()->profile()->GetPrefs()->GetBoolean(
prefs::kShowFullscreenToolbar);
}
if (IsFullscreen() && !show_fullscreen_toolbar) {
return false;
// Immersive full screen makes it possible to display the toolbar when
// kShowFullscreenToolbar is not set.
if (!base::FeatureList::IsEnabled(features::kImmersiveFullscreen)) {
if (IsFullscreen() && !show_fullscreen_toolbar) {
return false;
}
}
#endif
if (immersive_mode_controller_->ShouldHideTopViews())
@ -3335,6 +3340,31 @@ views::View* BrowserView::CreateOverlayView() {
return overlay_view_;
}
#if BUILDFLAG(IS_MAC)
views::View* BrowserView::CreateMacOverlayView() {
views::Widget::InitParams params;
// Keep around overlay_widget_ and overlay_view_ until this
// BrowserView is deconstructed. overlay_view_ is used during BrowserView
// deconstruction.
// TODO(bur): Refactor usage of WIDGET_OWNS_NATIVE_WIDGET.
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.type = views::Widget::InitParams::TYPE_POPUP;
params.child = true;
params.parent = GetWidget()->GetNativeView();
overlay_widget_ = std::make_unique<ThemeCopyingWidget>(GetWidget());
overlay_widget_->Init(std::move(params));
std::unique_ptr<TopContainerOverlayView> overlay_view =
std::make_unique<TopContainerOverlayView>(weak_ptr_factory_.GetWeakPtr());
overlay_view_targeter_ = std::make_unique<OverlayViewTargeterDelegate>();
overlay_view->SetEventTargeter(
std::make_unique<views::ViewTargeter>(overlay_view_targeter_.get()));
overlay_view_ = overlay_view.get();
overlay_widget_->GetRootView()->AddChildView(std::move(overlay_view));
return overlay_view_;
}
#endif // IS_MAC
void BrowserView::OnWidgetDestroying(views::Widget* widget) {
DCHECK(widget_observation_.IsObservingSource(widget));
widget_observation_.Reset();