diff options
author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 18:49:17 +0000 |
---|---|---|
committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 18:49:17 +0000 |
commit | 7e358974036ac5668c6fd779d9f0faaa3137baab (patch) | |
tree | 446456170dc2782167fdce833efa7497e7223f74 /chrome/renderer | |
parent | 4848b9f891c3d572f7dc88478e2a1ca84c28f92d (diff) | |
download | chromium_src-7e358974036ac5668c6fd779d9f0faaa3137baab.zip chromium_src-7e358974036ac5668c6fd779d9f0faaa3137baab.tar.gz chromium_src-7e358974036ac5668c6fd779d9f0faaa3137baab.tar.bz2 |
Move the clipboard messages to their own message filter.
BUG=75525
TEST=none
Review URL: http://codereview.chromium.org/6657013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r-- | chrome/renderer/render_view.cc | 3 | ||||
-rw-r--r-- | chrome/renderer/renderer_glue.cc | 19 |
2 files changed, 12 insertions, 10 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 513d5f5..c0a2e4b 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -29,6 +29,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/clipboard_messages.h" #include "chrome/common/database_messages.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" @@ -1547,7 +1548,7 @@ void RenderView::OnCopyToFindPboard() { if (frame->hasSelection()) { string16 selection = frame->selectionAsText(); RenderThread::current()->Send( - new ViewHostMsg_ClipboardFindPboardWriteStringAsync(selection)); + new ClipboardHostMsg_FindPboardWriteStringAsync(selection)); } UserMetricsRecordAction("CopyToFindPboard"); diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 2506066..6b325b8 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -18,6 +18,7 @@ #include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" +#include "chrome/common/clipboard_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" #include "chrome/plugin/npobject_util.h" @@ -115,14 +116,14 @@ ScopedClipboardWriterGlue::~ScopedClipboardWriterGlue() { if (shared_buf_) { RenderThread::current()->Send( - new ViewHostMsg_ClipboardWriteObjectsSync(objects_, + new ClipboardHostMsg_WriteObjectsSync(objects_, shared_buf_->handle())); delete shared_buf_; return; } RenderThread::current()->Send( - new ViewHostMsg_ClipboardWriteObjectsAsync(objects_)); + new ClipboardHostMsg_WriteObjectsAsync(objects_)); } namespace webkit_glue { @@ -161,23 +162,23 @@ bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format, ui::Clipboard::Buffer buffer) { bool result; RenderThread::current()->Send( - new ViewHostMsg_ClipboardIsFormatAvailable(format, buffer, &result)); + new ClipboardHostMsg_IsFormatAvailable(format, buffer, &result)); return result; } void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result) { - RenderThread::current()->Send(new ViewHostMsg_ClipboardReadText(buffer, + RenderThread::current()->Send(new ClipboardHostMsg_ReadText(buffer, result)); } void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result) { - RenderThread::current()->Send(new ViewHostMsg_ClipboardReadAsciiText(buffer, + RenderThread::current()->Send(new ClipboardHostMsg_ReadAsciiText(buffer, result)); } void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup, GURL* url) { - RenderThread::current()->Send(new ViewHostMsg_ClipboardReadHTML(buffer, + RenderThread::current()->Send(new ClipboardHostMsg_ReadHTML(buffer, markup, url)); } @@ -185,7 +186,7 @@ bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer, std::vector<string16>* types, bool* contains_filenames) { bool result = false; - RenderThread::current()->Send(new ViewHostMsg_ClipboardReadAvailableTypes( + RenderThread::current()->Send(new ClipboardHostMsg_ReadAvailableTypes( buffer, &result, types, contains_filenames)); return result; } @@ -193,7 +194,7 @@ bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer, bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type, string16* data, string16* metadata) { bool result = false; - RenderThread::current()->Send(new ViewHostMsg_ClipboardReadData( + RenderThread::current()->Send(new ClipboardHostMsg_ReadData( buffer, type, &result, data, metadata)); return result; } @@ -201,7 +202,7 @@ bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type, bool ClipboardReadFilenames(ui::Clipboard::Buffer buffer, std::vector<string16>* filenames) { bool result; - RenderThread::current()->Send(new ViewHostMsg_ClipboardReadFilenames( + RenderThread::current()->Send(new ClipboardHostMsg_ReadFilenames( buffer, &result, filenames)); return result; } |