cros/ash: If the partial magnifier is active, do not consume input events if over palette views.

ash/common/system/chromeos/palette/palette_tray.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/system/chromeos/palette/palette_tray.h"
 
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
@@ skipping 202 matching lines @@
   bubble_view->AddChildView(separator);
   AddToolsToView(bubble_view);
 
   // Show the bubble.
   bubble_.reset(new ash::TrayBubbleWrapper(this, bubble_view));
 
   SetDrawBackgroundAsActive(true);
   return true;
 }
 
+bool PaletteTray::ContainsPointInScreen(const gfx::Point& p) {

[James Cook, 2016/09/01 23:16:02]

nit: p -> point or similar

[jdufault, 2016/09/02 20:20:38]

Using p cleaned up some of the formatting to avoid line breaks. I've reverted
back to point.

+  return (icon_ && icon_->GetBoundsInScreen().Contains(p.x(), p.y())) ||

[James Cook, 2016/09/01 23:16:02]

nit: This might be more readable as multiple early returns, like

if (icon_ && icon_->blah)
  return true;
return bubble_ && bubble_->blah

[jdufault, 2016/09/02 20:20:38]

Also something I was toying with. Done.

+         (bubble_ &&
+          bubble_->bubble_view()->GetBoundsInScreen().Contains(p.x(), p.y()));
+}
+
 void PaletteTray::AddToolsToView(views::View* host) {
   std::vector<PaletteToolView> views = palette_tool_manager_->CreateViews();
   for (const PaletteToolView& view : views)
     host->AddChildView(view.view);
 }
 
 void PaletteTray::SessionStateChanged(
     SessionStateDelegate::SessionState state) {
   UpdateIconVisibility();
 }
@@ skipping 138 matching lines @@
       WmShell::Get()->GetSessionStateDelegate();
 
   SetVisible(!session_state_delegate->IsScreenLocked() &&
              session_state_delegate->GetSessionState() ==
                  SessionStateDelegate::SESSION_STATE_ACTIVE &&
              WmShell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
                  LoginStatus::KIOSK_APP);
 }
 
 }  // namespace ash