Index: content/public/browser/content_browser_client.h |
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h |
index 9fe6af0483e94ed896c6c57f23deb9fa1f3768d7..fb834c3b20e782b3ae570594ee161748dc0438d9 100644 |
--- a/content/public/browser/content_browser_client.h |
+++ b/content/public/browser/content_browser_client.h |
@@ -68,6 +68,9 @@ class SpeechRecognitionManagerDelegate; |
class WebContents; |
class WebContentsView; |
class WebContentsViewDelegate; |
+class WebRTCInternals; |
+class WebUIControllerFactory; |
dcheng
2013/01/31 22:25:56
Are these two lines supposed to be part of this pa
vasilii
2013/02/01 17:25:08
No, this was improper manual merge.
|
+struct ClipboardWriteCallbackParams; |
struct MainFunctionParams; |
struct ShowDesktopNotificationHostMsgParams; |
@@ -444,6 +447,11 @@ class CONTENT_EXPORT ContentBrowserClient { |
// Returns the directory containing hyphenation dictionaries. |
virtual FilePath GetHyphenDictionaryDirectory(); |
+ // Modifies Clipboard::ObjectMap before writing if the write is from |
+ // OffTheRecordProfile. |
Jói
2013/02/01 11:31:20
This documentation is for the abstract embedder ca
vasilii
2013/02/01 17:25:08
Done.
|
+ virtual void BeforeWriteToClipboard( |
+ const ClipboardWriteCallbackParams& params) {} |
Jói
2013/02/01 11:31:20
Why a struct rather than just passing two separate
vasilii
2013/02/01 17:25:08
Clipboard::ObjectMap is a typedef. I didn't want t
|
+ |
#if defined(OS_POSIX) && !defined(OS_MACOSX) |
// Populates |mappings| with all files that need to be mapped before launching |
// a child process. |