Index: ash/common/system/chromeos/palette/palette_tray.cc |
diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc |
index 80ecc3bb8117eda76ff491066ee15d2dd80d69b0..f76cf8200937b6365cfa46618eb1f922dea407f2 100644 |
--- a/ash/common/system/chromeos/palette/palette_tray.cc |
+++ b/ash/common/system/chromeos/palette/palette_tray.cc |
@@ -220,6 +220,12 @@ bool PaletteTray::ShowPalette() { |
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
|
+ 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
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) |