diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 17:35:13 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 17:35:13 +0000 |
| commit | 4bc899343f867283f5828f40fd845abc79c67723 (patch) | |
| tree | 07523d08f64230acd4c551016218ada5821516cb /chrome/browser | |
| parent | 622b788650a636236c3842f1287126fc60fb80ed (diff) | |
| download | chromium_src-4bc899343f867283f5828f40fd845abc79c67723.zip chromium_src-4bc899343f867283f5828f40fd845abc79c67723.tar.gz chromium_src-4bc899343f867283f5828f40fd845abc79c67723.tar.bz2 | |
Add SetMinimumWidth to Menu2 for chromeos.
This is to remove gtk dependency from menu2 code in chromeos and to make DOMUI transition smooth (crosbug.com/6497)
Removed LanguageSwitchModel::GetFirstLevelMenuWidth as this does not seem to be used by anyone.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3533001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chromeos/login/language_switch_menu.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/language_switch_menu.h | 3 | ||||
| -rw-r--r-- | chrome/browser/chromeos/status/network_menu.cc | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/chrome/browser/chromeos/login/language_switch_menu.cc b/chrome/browser/chromeos/login/language_switch_menu.cc index dc94c84..5f5d8c6 100644 --- a/chrome/browser/chromeos/login/language_switch_menu.cc +++ b/chrome/browser/chromeos/login/language_switch_menu.cc @@ -70,18 +70,9 @@ std::wstring LanguageSwitchMenu::GetCurrentLocaleName() const { 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 diff --git a/chrome/browser/chromeos/login/language_switch_menu.h b/chrome/browser/chromeos/login/language_switch_menu.h index a2819d9..a3db06e 100644 --- a/chrome/browser/chromeos/login/language_switch_menu.h +++ b/chrome/browser/chromeos/login/language_switch_menu.h @@ -33,8 +33,7 @@ class LanguageSwitchMenu : public views::ViewMenuDelegate, // Returns current locale name to be placed on the language menu-button. std::wstring GetCurrentLocaleName() const; - // Returns original width of the first level menu to be shown when called. - int GetFirstLevelMenuWidth() const; + // Sets the minimum width of the first level menu to be shown. void SetFirstLevelMenuWidth(int width); void set_menu_offset(int delta_x, int delta_y) { diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index 30065a6..dbcbfe4 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -167,7 +167,7 @@ void NetworkMenu::ActivatedAt(int index) { } void NetworkMenu::SetFirstLevelMenuWidth(int width) { - gtk_widget_set_size_request(network_menu_.GetNativeMenu(), width, -1); + network_menu_.SetMinimumWidth(width); } void NetworkMenu::CancelMenu() { |