Add SetMinimumWidth to Menu2 for chromeos. Removed LanguageSwitchModel::GetFirstLevelMenuWidth

chrome/browser/chromeos/login/language_switch_menu.cc

 // Copyright (c) 2010 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 "chrome/browser/chromeos/login/language_switch_menu.h"
 
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 52 matching lines @@
   menu_.reset(new views::Menu2(&menu_model_));
 }
 
 std::wstring LanguageSwitchMenu::GetCurrentLocaleName() const {
   DCHECK(g_browser_process);
   const std::string locale = g_browser_process->GetApplicationLocale();
   return language_list_->GetLanguageNameAt(
       language_list_->GetIndexFromLocale(locale));
 };
 
-// Currently, views::Menu is implemented directly with the Gtk
-// widgets. So we use native gtk callbacks to get its future size.
-int LanguageSwitchMenu::GetFirstLevelMenuWidth() const {
-  DCHECK(menu_ != NULL);
-  GtkRequisition box_size;
-  gtk_widget_size_request(menu_->GetNativeMenu(), &box_size);
-  return box_size.width;
-}
-
 void LanguageSwitchMenu::SetFirstLevelMenuWidth(int width) {
   DCHECK(menu_ != NULL);
-  gtk_widget_set_size_request(menu_->GetNativeMenu(), width, -1);
+  menu_->SetMinimumWidth(width);
 }
 
 // static
 void LanguageSwitchMenu::SwitchLanguage(const std::string& locale) {
   // Save new locale.
   DCHECK(g_browser_process);
   PrefService* prefs = g_browser_process->local_state();
   // TODO(markusheintz): If the preference is managed and can not be changed by
   // the user, changing the language should be disabled in the UI.
   // TODO(markusheintz): Change the if condition to prefs->IsUserModifiable()
@@ skipping 46 matching lines @@
 void LanguageSwitchMenu::ExecuteCommand(int command_id) {
   const std::string locale = language_list_->GetLocaleFromIndex(command_id);
   SwitchLanguage(locale);
   InitLanguageMenu();
 
   // Update all view hierarchies that the locale has changed.
   views::Widget::NotifyLocaleChanged();
 }
 
 }  // namespace chromeos