summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc2
-rw-r--r--chrome/browser/tab_contents/tab_contents.h2
-rw-r--r--chrome/common/render_messages_internal.h2
-rw-r--r--chrome/renderer/render_view.cc4
-rw-r--r--chrome/renderer/render_view.h2
5 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 5d384ce..261d547 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -727,9 +727,11 @@ void TabContents::Copy() {
render_view_host()->Copy();
}
+#if defined(OS_MACOSX)
void TabContents::CopyToFindPboard() {
render_view_host()->CopyToFindPboard();
}
+#endif
void TabContents::Paste() {
render_view_host()->Paste();
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index 1d91cd5..30c29e9 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -317,7 +317,9 @@ class TabContents : public PageNavigator,
// cut/copy/paste focus. (http://b/1117225)
virtual void Cut();
virtual void Copy();
+#if defined(OS_MACOSX)
virtual void CopyToFindPboard();
+#endif
virtual void Paste();
// Called on a TabContents when it isn't a popup, but a new window.
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 6658624..ccea8b5 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -193,7 +193,9 @@ IPC_BEGIN_MESSAGES(View)
IPC_MESSAGE_ROUTED0(ViewMsg_Redo)
IPC_MESSAGE_ROUTED0(ViewMsg_Cut)
IPC_MESSAGE_ROUTED0(ViewMsg_Copy)
+#if defined(OS_MACOSX)
IPC_MESSAGE_ROUTED0(ViewMsg_CopyToFindPboard)
+#endif
IPC_MESSAGE_ROUTED0(ViewMsg_Paste)
IPC_MESSAGE_ROUTED1(ViewMsg_Replace, std::wstring)
IPC_MESSAGE_ROUTED0(ViewMsg_ToggleSpellCheck)
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 1da9696..099cd1e 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -356,7 +356,9 @@ void RenderView::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(ViewMsg_Redo, OnRedo)
IPC_MESSAGE_HANDLER(ViewMsg_Cut, OnCut)
IPC_MESSAGE_HANDLER(ViewMsg_Copy, OnCopy)
+#if defined(OS_MACOSX)
IPC_MESSAGE_HANDLER(ViewMsg_CopyToFindPboard, OnCopyToFindPboard)
+#endif
IPC_MESSAGE_HANDLER(ViewMsg_Paste, OnPaste)
IPC_MESSAGE_HANDLER(ViewMsg_Replace, OnReplace)
IPC_MESSAGE_HANDLER(ViewMsg_ToggleSpellPanel, OnToggleSpellPanel)
@@ -831,6 +833,7 @@ void RenderView::OnCopy() {
UserMetricsRecordAction(L"Copy");
}
+#if defined(OS_MACOSX)
void RenderView::OnCopyToFindPboard() {
if (!webview())
return;
@@ -846,6 +849,7 @@ void RenderView::OnCopyToFindPboard() {
UserMetricsRecordAction(L"CopyToFindPboard");
}
+#endif
void RenderView::OnPaste() {
if (!webview())
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 4f9bc89..e9cdec9 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -535,7 +535,9 @@ class RenderView : public RenderWidget,
void OnRedo();
void OnCut();
void OnCopy();
+#if defined(OS_MACOSX)
void OnCopyToFindPboard();
+#endif
void OnPaste();
void OnReplace(const std::wstring& text);
void OnAdvanceToNextMisspelling();