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 b29adb60a1da6b0192eba1cb27e2e97c4b6deb10..db02bb6870cb788044bd8041ab7f7e03aa0119a7 100644 |
--- a/ash/common/system/tray/system_tray.cc |
+++ b/ash/common/system/tray/system_tray.cc |
@@ -539,11 +539,12 @@ void SystemTray::ShowItems(const std::vector<SystemTrayItem*>& items, |
// (like network) replaces most of the menu. |
full_system_tray_menu_ = items.size() > 1; |
// The menu width is fixed, and it is a per language setting. |
- int menu_width = std::max( |
- MaterialDesignController::IsSystemTrayMenuMaterial() |
- ? kMinimumSystemTrayMenuWidthMd |
- : kMinimumSystemTrayMenuWidth, |
- WmShell::Get()->system_tray_delegate()->GetSystemTrayMenuWidth()); |
+ int menu_width = |
+ std::max(MaterialDesignController::IsSystemTrayMenuMaterial() |
+ ? kMinimumSystemTrayMenuWidthMd |
James Cook
2016/10/26 00:03:29
I have email out to tdanderson@ (who is working on
|
+ : kMinimumSystemTrayMenuWidth, |
+ l10n_util::GetLocalizedContentsWidthInPixels( |
+ IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS)); |
TrayBubbleView::InitParams init_params(TrayBubbleView::ANCHOR_TYPE_TRAY, |
GetAnchorAlignment(), menu_width, |