Views: Don't layout frame on title change if window title isn't displayed

Bug: 858944, 835983
Change-Id: Ia7908a1a199a1e537bf7ba7668116e018cbd4e61
Reviewed-on: https://chromium-review.googlesource.com/1144138Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577884}

chrome/browser/ui/views/frame/glass_browser_frame_view.cc

@@ -387,8 +387,10 @@ void GlassBrowserFrameView::UpdateWindowIcon() {
 }
 
 void GlassBrowserFrameView::UpdateWindowTitle() {
-  if (ShowCustomTitle() && !frame()->IsFullscreen())
+  if (ShowCustomTitle() && !frame()->IsFullscreen()) {
+    LayoutTitleBar();
     window_title_->SchedulePaint();
+  }
 }
 
 void GlassBrowserFrameView::ResetWindowControls() {

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

@@ -284,8 +284,10 @@ void OpaqueBrowserFrameView::UpdateWindowIcon() {
 }
 
 void OpaqueBrowserFrameView::UpdateWindowTitle() {
-  if (!frame()->IsFullscreen())
+  if (!frame()->IsFullscreen() && ShouldShowWindowTitle()) {
+    Layout();
     window_title_->SchedulePaint();
+  }
 }
 
 void OpaqueBrowserFrameView::SizeConstraintsChanged() {}

ui/views/bubble/bubble_frame_view.cc

@@ -272,6 +272,7 @@ void BubbleFrameView::UpdateWindowTitle() {
                                !delegate->GetWindowTitle().empty());
     default_title_->SetText(delegate->GetWindowTitle());
   }  // custom_title_'s updates are handled by its creator.
+  Layout();
 }
 
 void BubbleFrameView::SizeConstraintsChanged() {}

ui/views/widget/widget.cc

@@ -836,10 +836,6 @@ void Widget::UpdateWindowTitle() {
     return;
 
   non_client_view_->UpdateWindowTitle();
-
-  // If the non-client view is rendering its own title, it'll need to relayout
-  // now and to get a paint update later on.
-  non_client_view_->Layout();
 }
 
 void Widget::UpdateWindowIcon() {

ui/views/window/custom_frame_view.cc

@@ -197,8 +197,12 @@ void CustomFrameView::UpdateWindowIcon() {
 }
 
 void CustomFrameView::UpdateWindowTitle() {
-  if (frame_->widget_delegate()->ShouldShowWindowTitle())
+  if (frame_->widget_delegate()->ShouldShowWindowTitle() &&
+      // If this is still unset, we haven't laid out window controls yet.
+      maximum_title_bar_x_ > -1) {
+    LayoutTitleBar();
     SchedulePaintInRect(title_bounds_);
+  }
 }
 
 void CustomFrameView::SizeConstraintsChanged() {