| Index: ui/base/x/selection_requestor.h
|
| diff --git a/ui/base/x/selection_requestor.h b/ui/base/x/selection_requestor.h
|
| index 10a7c06825e3dd78c7044250815bc0265294a33e..52ad1cf6266cfa704962f7d558a2fc62161bad52 100644
|
| --- a/ui/base/x/selection_requestor.h
|
| +++ b/ui/base/x/selection_requestor.h
|
| @@ -10,12 +10,15 @@
|
| // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
|
| #undef RootWindow
|
|
|
| +#include <vector>
|
| +
|
| #include "base/basictypes.h"
|
| #include "base/callback.h"
|
| #include "ui/base/ui_export.h"
|
| #include "ui/base/x/x11_atom_cache.h"
|
|
|
| namespace ui {
|
| +class SelectionData;
|
|
|
| // Requests and later receives data from the X11 server through the selection
|
| // system.
|
| @@ -42,6 +45,11 @@ class UI_EXPORT SelectionRequestor {
|
| size_t* out_data_items,
|
| ::Atom* out_type);
|
|
|
| + // Returns the first of |types| offered by the current selection holder, or
|
| + // returns NULL if none of those types are available.
|
| + scoped_ptr<SelectionData> RequestAndWaitForTypes(
|
| + const std::vector< ::Atom>& types);
|
| +
|
| // It is our owner's responsibility to plumb X11 SelectionNotify events on
|
| // |xwindow_| to us.
|
| void OnSelectionNotify(const XSelectionEvent& event);
|
|
|