Wires up immersive mode for chrome and mash

ash/common/frame/header_view.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/frame/header_view.h"
 
 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/common/frame/default_header_painter.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 28 matching lines @@
 
 void HeaderView::SchedulePaintForTitle() {
   header_painter_->SchedulePaintForTitle();
 }
 
 void HeaderView::ResetWindowControls() {
   caption_button_container_->ResetWindowControls();
 }
 
 int HeaderView::GetPreferredOnScreenHeight() const {
-  if (target_widget_->IsFullscreen()) {
+  if (is_immersive_delegate_ && target_widget_->IsFullscreen()) {
     return static_cast<int>(GetPreferredHeight() *
                             fullscreen_visible_fraction_);
   }
   return GetPreferredHeight();
 }
 
 int HeaderView::GetPreferredHeight() const {
   return header_painter_->GetHeaderHeightForPainting();
 }
 
@@ skipping 124 matching lines @@
   gfx::Rect visible_bounds(GetVisibleBounds());
   gfx::Point visible_origin_in_screen(visible_bounds.origin());
   views::View::ConvertPointToScreen(this, &visible_origin_in_screen);
   std::vector<gfx::Rect> bounds_in_screen;
   bounds_in_screen.push_back(
       gfx::Rect(visible_origin_in_screen, visible_bounds.size()));
   return bounds_in_screen;
 }
 
 }  // namespace ash