diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 20:51:02 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 20:51:02 +0000 |
| commit | 40e59f901bc45d009b01b5252dc1e6140ba67642 (patch) | |
| tree | 880793e36522e87653c88b867b6e166d2a8d33c2 /views/controls/menu/menu_config_gtk.cc | |
| parent | 34831e0d903dc77863f64096e73f136f4742269b (diff) | |
| download | chromium_src-40e59f901bc45d009b01b5252dc1e6140ba67642.zip chromium_src-40e59f901bc45d009b01b5252dc1e6140ba67642.tar.gz chromium_src-40e59f901bc45d009b01b5252dc1e6140ba67642.tar.bz2 | |
Attempt 2 at landing bookmark menus.
The build breakage was the result of a bad ifdef in MenuController,
specifically around the OnKeyDown method.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/173517
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_config_gtk.cc')
| -rw-r--r-- | views/controls/menu/menu_config_gtk.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/views/controls/menu/menu_config_gtk.cc b/views/controls/menu/menu_config_gtk.cc index 1930824..acb77ff 100644 --- a/views/controls/menu/menu_config_gtk.cc +++ b/views/controls/menu/menu_config_gtk.cc @@ -4,12 +4,23 @@ #include "views/controls/menu/menu_config.h" +#include "app/resource_bundle.h" +#include "grit/app_resources.h" +#include "third_party/skia/include/core/SkBitmap.h" + namespace views { // static MenuConfig* MenuConfig::Create() { // TODO: decide what we want this to look like. - return new MenuConfig(); + MenuConfig* config = new MenuConfig(); + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); + config->font = rb.GetFont(ResourceBundle::BaseFont); + config->arrow_width = rb.GetBitmapNamed(IDR_MENU_ARROW)->width(); + // Add 4 to force some padding between check and label. + config->check_width = rb.GetBitmapNamed(IDR_MENU_CHECK)->width() + 4; + config->check_height = rb.GetBitmapNamed(IDR_MENU_CHECK)->height(); + return config; } } // namespace views |