Chromium Code Reviews| Index: ash/common/system/tray/system_tray.cc |
| diff --git a/ash/common/system/tray/system_tray.cc b/ash/common/system/tray/system_tray.cc |
| index 75a6b093c7e8bcad0b1bfa15c65578d7ce865ab2..d5644870adb1f897662486f85c36eb0f0c14588e 100644 |
| --- a/ash/common/system/tray/system_tray.cc |
| +++ b/ash/common/system/tray/system_tray.cc |
| @@ -6,6 +6,7 @@ |
| #include "ash/common/ash_switches.h" |
| #include "ash/common/login_status.h" |
| +#include "ash/common/material_design/material_design_controller.h" |
| #include "ash/common/session/session_state_delegate.h" |
| #include "ash/common/shelf/wm_shelf.h" |
| #include "ash/common/shelf/wm_shelf_util.h" |
| @@ -627,6 +628,9 @@ void SystemTray::SetShelfAlignment(ShelfAlignment alignment) { |
| if (alignment == shelf_alignment()) |
| return; |
| TrayBackgroundView::SetShelfAlignment(alignment); |
| + // if (!ash::MaterialDesignController::IsShelfMaterial()) |
| + // AdjustStatusTrayBackground(); |
|
yoshiki
2016/08/18 08:39:08
nit: Please remove the unnecessary code.
yiyix
2016/08/18 20:01:43
sorry, I forget to remove these dead codes from my
|
| + |
| UpdateAfterShelfAlignmentChange(alignment); |
| // Destroy any existing bubble so that it is rebuilt correctly. |
| CloseSystemBubbleAndDeactivateSystemTray(); |