Fix regression where font size too small for IME short name

ash/common/system/chromeos/ime_menu/ime_list_view.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/ime_menu/ime_list_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/ime_info.h"
 #include "ash/common/system/tray/system_menu_button.h"
@@ skipping 87 matching lines @@
     id_label->SetText(id);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     const gfx::FontList& base_font_list =
         rb.GetFontList(ui::ResourceBundle::MediumBoldFont);
     id_label->SetFontList(base_font_list);
 
     // For IMEs whose short name are more than 2 characters (INTL, EXTD, etc.),
     // |kMenuIconSize| is not enough. The label will trigger eliding as "I..."
     // or "...". So we shrink the font size until it fits within the bounds.
     int size_delta = -1;
-    while (id_label->GetPreferredSize().width() > kMenuIconSize &&
+    while ((id_label->GetPreferredSize().width() -
+            id_label->GetInsets().width()) > kMenuIconSize &&
            size_delta >= kMinFontSizeDelta) {
       id_label->SetFontList(base_font_list.DeriveWithSizeDelta(size_delta));
       --size_delta;
     }
     tri_view->AddView(TriView::Container::START, id_label);
 
     // The label shows the IME name.
     auto label_view = TrayPopupUtils::CreateDefaultLabel();
     label_view->SetText(label);
     TrayPopupItemStyle style(
@@ skipping 340 matching lines @@
 ImeListViewTestApi::ImeListViewTestApi(ImeListView* ime_list_view)
     : ime_list_view_(ime_list_view) {}
 
 ImeListViewTestApi::~ImeListViewTestApi() {}
 
 views::View* ImeListViewTestApi::GetToggleView() const {
   return ime_list_view_->material_keyboard_status_view_->toggle();
 }
 
 }  // namespace ash