Fix build when ENABLE_MANAGED_USERS is not defined

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

 // Copyright (c) 2012 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/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/signin/signin_header_helper.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.h"
-#include "chrome/browser/ui/views/profiles/avatar_label.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/theme_image_mapper.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/pref_names.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 14 matching lines @@
 #include "ui/gfx/rect_conversions.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/window/frame_background.h"
 #include "ui/views/window/window_shape.h"
 
+#if defined(ENABLE_MANAGED_USERS)
+#include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
+#endif
+
 #if defined(OS_LINUX)
 #include "ui/views/controls/menu/menu_runner.h"
 #endif
 
 using content::WebContents;
 
 namespace {
 
 // While resize areas on Windows are normally the same size as the window
 // borders, our top area is shrunk by 1 px to make it easier to move the window
@@ skipping 132 matching lines @@
 
 gfx::Rect OpaqueBrowserFrameView::GetBoundsForClientView() const {
   return layout_->client_view_bounds();
 }
 
 gfx::Rect OpaqueBrowserFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   return layout_->GetWindowBoundsForClientBounds(client_bounds);
 }
 
+bool OpaqueBrowserFrameView::IsWithinAvatarMenuButtons(
+    const gfx::Point& point) const {
+  return (avatar_button() &&
+         (avatar_button()->GetMirroredBounds().Contains(point))) ||

[Bernhard Bauer, 2014/07/14 16:39:05]

Consider also splitting this up into two checks.

[mckev, 2014/07/14 23:50:03]

OK - I took a stab at it.  Let me know what you think of the approach I took.

[Bernhard Bauer, 2014/07/16 09:53:59]

You can simplify this with multiple returns:

  if (avatar_button() &&
      avatar_button()->GetMirroredBounds().Contains(point)) {
    return true;
  }

  if (new_avatar_button() &&
      new_avatar_button()->GetMirroredBounds().Contains(point)) {
    return true;
  }

  return false;

That makes it a bit more readable IMO.

+         (new_avatar_button() &&
+          new_avatar_button()->GetMirroredBounds().Contains(point));
+}
+
 int OpaqueBrowserFrameView::NonClientHitTest(const gfx::Point& point) {
   if (!bounds().Contains(point))
     return HTNOWHERE;
 
   // See if the point is within the avatar menu button or within the avatar
   // label.
-  if ((avatar_button() &&
-       avatar_button()->GetMirroredBounds().Contains(point)) ||
-      (avatar_label() && avatar_label()->GetMirroredBounds().Contains(point)) ||
-      (new_avatar_button() &&
-       new_avatar_button()->GetMirroredBounds().Contains(point)))
+#if defined(ENABLE_MANAGED_USERS)
+  if (IsWithinAvatarMenuButtons(point) ||

[Bernhard Bauer, 2014/07/14 16:39:05]

Same here.

[mckev, 2014/07/14 23:50:03]

Sure thing, makes sense since I made a similar change in
browser_non-client_frame_view_ash.cc.

+      (supervised_user_avatar_label() &&
+       supervised_user_avatar_label()->GetMirroredBounds().Contains(point)))
     return HTCLIENT;
+#else
+  if (IsWithinAvatarMenuButtons(point))
+    return HTCLIENT;
+#endif
 
   int frame_component = frame()->client_view()->NonClientHitTest(point);
 
   // See if we're in the sysmenu region.  We still have to check the tabstrip
   // first so that clicks in a tab don't get treated as sysmenu clicks.
   gfx::Rect sysmenu_rect(IconBounds());
   // In maximized mode we extend the rect to the screen corner to take advantage
   // of Fitts' Law.
   if (layout_->IsTitleBarCondensed())
     sysmenu_rect.SetRect(0, 0, sysmenu_rect.right(), sysmenu_rect.bottom());
@@ skipping 672 matching lines @@
 
 int OpaqueBrowserFrameView::GetTopAreaHeight() const {
   gfx::ImageSkia* frame_image = GetFrameImage();
   int top_area_height = frame_image->height();
   if (browser_view()->IsTabStripVisible()) {
     top_area_height = std::max(top_area_height,
       GetBoundsForTabStrip(browser_view()->tabstrip()).bottom());
   }
   return top_area_height;
 }