| Index: chrome/browser/gtk/bookmark_context_menu.h
|
| ===================================================================
|
| --- chrome/browser/gtk/bookmark_context_menu.h (revision 25977)
|
| +++ chrome/browser/gtk/bookmark_context_menu.h (working copy)
|
| @@ -15,7 +15,7 @@
|
| // TODO(port): Port this file.
|
| #if defined(TOOLKIT_VIEWS)
|
| #include "views/controls/menu/menu_delegate.h"
|
| -#elif defined(OS_LINUX)
|
| +#elif defined(USE_X11)
|
| #include "chrome/browser/gtk/menu_gtk.h"
|
| #else
|
| #include "chrome/common/temp_scaffolding_stubs.h"
|
| @@ -31,7 +31,7 @@
|
| class BookmarkContextMenu : public BookmarkModelObserver,
|
| #if defined(TOOLKIT_VIEWS)
|
| public views::MenuDelegate
|
| -#elif defined(OS_LINUX)
|
| +#elif defined(USE_X11)
|
| public MenuGtk::Delegate
|
| #endif
|
| {
|
| @@ -72,7 +72,7 @@
|
|
|
| // Returns the menu.
|
| views::MenuItemView* menu() const { return menu_.get(); }
|
| -#elif defined(OS_LINUX)
|
| +#elif defined(USE_X11)
|
| // Pops up this menu. This call doesn't block.
|
| void PopupAsContext(guint32 event_time);
|
|
|
| @@ -146,7 +146,7 @@
|
|
|
| #if defined(OS_WIN) || defined(TOOLKIT_VIEWS)
|
| scoped_ptr<views::MenuItemView> menu_;
|
| -#elif defined(OS_LINUX)
|
| +#elif defined(USE_X11)
|
| scoped_ptr<MenuGtk> menu_;
|
| #endif
|
|
|
|
|