ChromeOS MD: Fix cannot drag tab onto immersive fullscreen window

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index 1a365347458817eec09cad8f63ece1f0821e364e..4735f87508e850b2daa888d704de4d562b559303 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -11,6 +11,7 @@
 #include "ash/common/frame/default_header_painter.h"
 #include "ash/common/frame/frame_border_hit_test.h"
 #include "ash/common/frame/header_painter_util.h"
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
@@ -262,8 +263,15 @@ void BrowserNonClientFrameViewAsh::Layout() {
   header_painter_->LayoutHeader();
 
   int painted_height = GetTopInset(false);
-  if (browser_view()->IsTabStripVisible())
-    painted_height += browser_view()->tabstrip()->GetPreferredSize().height();
+  if (browser_view()->IsTabStripVisible()) {
+    const ImmersiveModeController* const immersive_controller =
+        browser_view()->immersive_mode_controller();
+    if (!immersive_controller->IsEnabled() ||
+        immersive_controller->IsRevealed() ||
+        !ash::MaterialDesignController::IsImmersiveModeMaterial()) {
+      painted_height += browser_view()->tabstrip()->GetPreferredSize().height();
+    }
+  }
 
   header_painter_->SetHeaderHeightForPainting(painted_height);
 
@@ -384,6 +392,9 @@ int BrowserNonClientFrameViewAsh::GetTabStripRightInset() const {
 }
 
 bool BrowserNonClientFrameViewAsh::UseImmersiveLightbarHeaderStyle() const {
+  if (ash::MaterialDesignController::IsImmersiveModeMaterial())
+    return false;
+
   const ImmersiveModeController* const immersive_controller =
       browser_view()->immersive_mode_controller();
   return immersive_controller->IsEnabled() &&