Chromium Code Reviews| Index: ash/system/palette/palette_tray.cc |
| diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc |
| index 56380ce345ccaa24056b075636e18ff44c761ba8..ecfd13b034dffae4dfa5715f3dc8e21d886160d5 100644 |
| --- a/ash/system/palette/palette_tray.cc |
| +++ b/ash/system/palette/palette_tray.cc |
| @@ -22,6 +22,7 @@ |
| #include "ash/system/tray/system_tray_delegate.h" |
| #include "ash/system/tray/tray_bubble_wrapper.h" |
| #include "ash/system/tray/tray_constants.h" |
| +#include "ash/system/tray/tray_container.h" |
|
James Cook
2017/04/17 16:54:35
Is this needed?
mohsen
2017/04/19 22:59:07
Yes, this file works with TrayBackgroundView::tray
|
| #include "ash/system/tray/tray_popup_header_button.h" |
| #include "ash/system/tray/tray_popup_item_style.h" |
| #include "ash/wm_shell.h" |
| @@ -149,7 +150,7 @@ class TitleView : public views::View, public views::ButtonListener { |
| } // namespace |
| PaletteTray::PaletteTray(WmShelf* wm_shelf) |
| - : TrayBackgroundView(wm_shelf, true), |
| + : TrayBackgroundView(wm_shelf), |
| palette_tool_manager_(new PaletteToolManager(this)), |
| weak_factory_(this) { |
| PaletteTool::RegisterToolInstances(palette_tool_manager_.get()); |
| @@ -386,13 +387,6 @@ WmWindow* PaletteTray::GetWindow() { |
| return shelf()->GetWindow(); |
| } |
| -void PaletteTray::SetShelfAlignment(ShelfAlignment alignment) { |
| - if (alignment == shelf_alignment()) |
| - return; |
| - |
| - TrayBackgroundView::SetShelfAlignment(alignment); |
| -} |
| - |
| void PaletteTray::AnchorUpdated() { |
| if (bubble_) |
| bubble_->bubble_view()->UpdateBubble(); |