Merge 86845 - Fix hittesting in the OpaqueBrowserFrameView for frames without a tabstrip. The Hi...

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

Index: chrome/browser/ui/views/frame/glass_browser_frame_view.cc
===================================================================
--- chrome/browser/ui/views/frame/glass_browser_frame_view.cc	(revision 86845)
+++ chrome/browser/ui/views/frame/glass_browser_frame_view.cc	(working copy)
@@ -265,13 +265,10 @@
 bool GlassBrowserFrameView::HitTest(const gfx::Point& l) const {
   // The ProfileMenuButton intrudes into the client area when the window is
   // maximized.
-  if (frame_->GetWindow()->IsMaximized() && show_profile_button() &&
-       profile_button_->IsVisible() &&
-       profile_button_->GetMirroredBounds().Contains(l)) {
-    return true;
-  } else {
-    return !GetWindow()->client_view()->bounds().Contains(l);
-  }
+  return (frame_->GetWindow()->IsMaximized() && show_profile_button() &&
+          profile_button_->IsVisible() &&
+          profile_button_->GetMirroredBounds().Contains(l)) ||
+      !GetWindow()->client_view()->bounds().Contains(l);
 }
 
 ///////////////////////////////////////////////////////////////////////////////