Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc

Issue 310193002: linux_aura: Theoretical crash for full screen transition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698