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

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

 // Copyright (c) 2011 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 "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 247 matching lines @@
 
 void GlassBrowserFrameView::Layout() {
   LayoutOTRAvatar();
   LayoutClientView();
   LayoutProfileTag();
 }
 
 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);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GlassBrowserFrameView, private:
 
 int GlassBrowserFrameView::FrameBorderThickness() const {
   views::Window* window = frame_->GetWindow();
   return (window->IsMaximized() || window->IsFullscreen()) ?
       0 : GetSystemMetrics(SM_CXSIZEFRAME);
 }
@@ skipping 337 matching lines @@
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle &rb = ResourceBundle::GetSharedInstance();
     for (int i = 0; i < kThrobberIconCount; ++i) {
       throbber_icons_[i] = rb.LoadThemeIcon(IDI_THROBBER_01 + i);
       DCHECK(throbber_icons_[i]);
     }
     initialized = true;
   }
 }