| Index: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
|
| diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
|
| index 5c5dd456d63fb52de53b72b6773ed609f35b507a..b23e670975b0cc52050861b72e8572b484f7326b 100644
|
| --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
|
| +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
|
| @@ -313,8 +313,8 @@ void OpaqueBrowserFrameViewLayout::LayoutTitleBar(views::View* host) {
|
|
|
| int size = delegate_->GetIconSize();
|
| int frame_thickness = FrameBorderThickness(false);
|
| - bool should_show_icon = delegate_->ShouldShowWindowIcon();
|
| - bool should_show_title = delegate_->ShouldShowWindowTitle();
|
| + bool should_show_icon = delegate_->ShouldShowWindowIcon() && window_icon_;
|
| + bool should_show_title = delegate_->ShouldShowWindowTitle() && window_title_;
|
|
|
| if (should_show_icon || should_show_title) {
|
| use_hidden_icon_location = false;
|
|
|