diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 22:53:36 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 22:53:36 +0000 |
| commit | 360d2ec2b1baa71f82f99cba96e4e97e74f6f941 (patch) | |
| tree | dd04736de67bb0f322cadd99e36a13fb8aaf5335 /ui/base/models | |
| parent | 5f89b6570b214565e89301b652b95175fdf5b1c2 (diff) | |
| download | chromium_src-360d2ec2b1baa71f82f99cba96e4e97e74f6f941.zip chromium_src-360d2ec2b1baa71f82f99cba96e4e97e74f6f941.tar.gz chromium_src-360d2ec2b1baa71f82f99cba96e4e97e74f6f941.tar.bz2 | |
GTK: Implement rough global menu support behind an about:flags flag.
This is a super early first cut of global menu support. It works by creating a GtkMenuBar inside chrome, attaching it to the widget hierarchy and then never showing it. This is sufficient for global menu support to detect the menu, at least on the Natty betas.
There's a lot to do before this is considered done. I haven't added Bookmark and History menus, which will need custom handling to keep state up to date with the main window. Some items may need to be moved from one menu to another to fit with Linux conventions.
Contains a bunch of new strings for global menu support. These need to go in before the M12 branch point. (I can iterate on the design afterwards; strings need translation.)
BUG=30213
TEST=Open a window on Unity. A minimal menu is in the menu bar.
Review URL: http://codereview.chromium.org/6812037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/models')
| -rw-r--r-- | ui/base/models/accelerator_gtk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/base/models/accelerator_gtk.h b/ui/base/models/accelerator_gtk.h index c38abb2..720e291 100644 --- a/ui/base/models/accelerator_gtk.h +++ b/ui/base/models/accelerator_gtk.h @@ -45,7 +45,7 @@ class AcceleratorGtk : public Accelerator { gdk_keyval_ : ui::GdkKeyCodeForWindowsKeyCode(key_code_, false); } - GdkModifierType gdk_modifier_type() { + GdkModifierType gdk_modifier_type() const { return static_cast<GdkModifierType>(modifiers()); } |