| Index: webkit/glue/webkit_glue.h
|
| diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
|
| index fe1799c54cd1cbc0715f6beab270d8621bd58745..c099c3025725317f359e82e93bbdbe1d38f235f6 100644
|
| --- a/webkit/glue/webkit_glue.h
|
| +++ b/webkit/glue/webkit_glue.h
|
| @@ -19,7 +19,6 @@
|
| #include "base/string16.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h"
|
| -#include "ui/base/clipboard/clipboard.h"
|
|
|
| class GURL;
|
| class SkBitmap;
|
| @@ -167,36 +166,6 @@ string16 GetLocalizedString(int message_id);
|
| // specified as BINDATA in the relevant .rc file.
|
| base::StringPiece GetDataResource(int resource_id);
|
|
|
| -// Glue to access the clipboard.
|
| -
|
| -// Get a clipboard that can be used to construct a ScopedClipboardWriterGlue.
|
| -ui::Clipboard* ClipboardGetClipboard();
|
| -
|
| -// Get a sequence number which uniquely identifies clipboard state.
|
| -uint64 ClipboardGetSequenceNumber(ui::Clipboard::Buffer buffer);
|
| -
|
| -// Tests whether the clipboard contains a certain format
|
| -bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format,
|
| - ui::Clipboard::Buffer buffer);
|
| -
|
| -// Reads the available types from the clipboard, if available.
|
| -void ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
|
| - std::vector<string16>* types,
|
| - bool* contains_filenames);
|
| -
|
| -// Reads UNICODE text from the clipboard, if available.
|
| -void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result);
|
| -
|
| -// Reads ASCII text from the clipboard, if available.
|
| -void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result);
|
| -
|
| -// Reads HTML from the clipboard, if available.
|
| -void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
|
| - GURL* url, uint32* fragment_start,
|
| - uint32* fragment_end);
|
| -
|
| -void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data);
|
| -
|
| // Embedders implement this function to return the list of plugins to Webkit.
|
| void GetPlugins(bool refresh,
|
| std::vector<webkit::WebPluginInfo>* plugins);
|
| @@ -205,13 +174,6 @@ void GetPlugins(bool refresh,
|
| // required by the media engine.
|
| bool IsProtocolSupportedForMedia(const GURL& url);
|
|
|
| -// Returns the locale that this instance of webkit is running as. This is of
|
| -// the form language-country (e.g., en-US or pt-BR).
|
| -std::string GetWebKitLocale();
|
| -
|
| -// Returns true if the embedder is running in single process mode.
|
| -bool IsSingleProcess();
|
| -
|
| // ---- END FUNCTIONS IMPLEMENTED BY EMBEDDER ---------------------------------
|
|
|
|
|
|
|