From ea97f431451b7c1800a76aa32c514370d7f0ecf8 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 8 May 2018 15:24:53 +0900 Subject: [PATCH] check content view in SetMenuBarVisibility --- atom/browser/ui/cocoa/root_view_mac.mm | 8 +++----- atom/browser/ui/views/root_view.cc | 10 ++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/atom/browser/ui/cocoa/root_view_mac.mm b/atom/browser/ui/cocoa/root_view_mac.mm index 6f9e81e879df..1ecebfe06c84 100644 --- a/atom/browser/ui/cocoa/root_view_mac.mm +++ b/atom/browser/ui/cocoa/root_view_mac.mm @@ -4,7 +4,7 @@ #include "atom/browser/ui/cocoa/root_view_mac.h" -#include "atom/browser/native_window_mac.h" +#include "atom/browser/native_window.h" namespace atom { @@ -15,12 +15,10 @@ RootViewMac::RootViewMac(NativeWindow* window) : window_(window) { RootViewMac::~RootViewMac() {} void RootViewMac::Layout() { - views::View* content_view = - static_cast(window_)->content_view(); - if (!content_view) // Not ready yet. + if (!window_->content_view()) // Not ready yet. return; - content_view->SetBoundsRect(gfx::Rect(gfx::Point(), size())); + window_->content_view()->SetBoundsRect(gfx::Rect(gfx::Point(), size())); } gfx::Size RootViewMac::GetMinimumSize() const { diff --git a/atom/browser/ui/views/root_view.cc b/atom/browser/ui/views/root_view.cc index b49dd014b07c..716563ff0141 100644 --- a/atom/browser/ui/views/root_view.cc +++ b/atom/browser/ui/views/root_view.cc @@ -4,7 +4,7 @@ #include "atom/browser/ui/views/root_view.h" -#include "atom/browser/native_window_views.h" +#include "atom/browser/native_window.h" #include "atom/browser/ui/views/menu_bar.h" #include "content/public/browser/native_web_keyboard_event.h" @@ -86,7 +86,7 @@ bool RootView::IsMenuBarAutoHide() const { } void RootView::SetMenuBarVisibility(bool visible) { - if (!menu_bar_ || menu_bar_visible_ == visible) + if (!window_->content_view() || !menu_bar_ || menu_bar_visible_ == visible) return; // Always show the accelerator when the auto-hide menu bar shows. @@ -151,9 +151,7 @@ void RootView::ResetAltState() { } void RootView::Layout() { - views::View* content_view = - static_cast(window_)->content_view(); - if (!content_view) // Not ready yet. + if (!window_->content_view()) // Not ready yet. return; const auto menu_bar_bounds = @@ -162,7 +160,7 @@ void RootView::Layout() { if (menu_bar_) menu_bar_->SetBoundsRect(menu_bar_bounds); - content_view->SetBoundsRect( + window_->content_view()->SetBoundsRect( gfx::Rect(0, menu_bar_bounds.height(), size().width(), size().height() - menu_bar_bounds.height())); }