}
// static
-std::string GlobalMenuBarX11::GetPathForWindow(unsigned long xid) {
+std::string GlobalMenuBarX11::GetPathForWindow(gfx::AcceleratedWidget xid) {
return base::StringPrintf("/com/canonical/menu/%lX", xid);
}
g_object_unref(root_item);
}
-void GlobalMenuBarX11::InitServer(unsigned long xid) {
+void GlobalMenuBarX11::InitServer(gfx::AcceleratedWidget xid) {
std::string path = GetPathForWindow(xid);
server_ = server_new(path.c_str());
}
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ui/base/glib/glib_signal.h"
+#include "ui/gfx/native_widget_types.h"
typedef struct _DbusmenuMenuitem DbusmenuMenuitem;
typedef struct _DbusmenuServer DbusmenuServer;
// from menu models instead, and it is also per-window specific.
class GlobalMenuBarX11 {
public:
- GlobalMenuBarX11(NativeWindowViews* window);
+ explicit GlobalMenuBarX11(NativeWindowViews* window);
virtual ~GlobalMenuBarX11();
// Creates the object path for DbusemenuServer which is attached to |xid|.
- static std::string GetPathForWindow(unsigned long xid);
+ static std::string GetPathForWindow(gfx::AcceleratedWidget xid);
void SetMenu(ui::MenuModel* menu_model);
private:
// Creates a DbusmenuServer.
- void InitServer(unsigned long xid);
+ void InitServer(gfx::AcceleratedWidget xid);
// Create a menu from menu model.
void BuildMenuFromModel(ui::MenuModel* model, DbusmenuMenuitem* parent);
CHROMEG_CALLBACK_0(GlobalMenuBarX11, void, OnSubMenuShow, DbusmenuMenuitem*);
NativeWindowViews* window_;
- int xid_;
+ gfx::AcceleratedWidget xid_;
DbusmenuServer* server_;