| Index: content/browser/renderer_host/render_message_filter.cc
|
| diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
|
| index 0238bd37dd2cfd7a8597c9c876cc82d724baccf2..024ab95719bec1965b2b883faa497a01f3685673 100644
|
| --- a/content/browser/renderer_host/render_message_filter.cc
|
| +++ b/content/browser/renderer_host/render_message_filter.cc
|
| @@ -55,6 +55,7 @@
|
| #include "net/url_request/url_request_context.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h"
|
| +#include "ui/gfx/color_profile.h"
|
| #include "webkit/glue/webcookie.h"
|
| #include "webkit/glue/webkit_glue.h"
|
| #include "webkit/plugins/npapi/plugin_group.h"
|
| @@ -391,6 +392,8 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message,
|
| OnGetHardwareSampleRate)
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_GetHardwareInputChannelLayout,
|
| OnGetHardwareInputChannelLayout)
|
| + IPC_MESSAGE_HANDLER(ViewHostMsg_GetMonitorColorProfile,
|
| + OnGetMonitorColorProfile)
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_MediaLogEvent, OnMediaLogEvent)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP_EX()
|
| @@ -402,6 +405,15 @@ void RenderMessageFilter::OnDestruct() const {
|
| BrowserThread::DeleteOnIOThread::Destruct(this);
|
| }
|
|
|
| +void RenderMessageFilter::OverrideThreadForMessage(
|
| + const IPC::Message& message, BrowserThread::ID* thread) {
|
| +#if defined(OS_WIN)
|
| + // Windows monitor profile must be read from a file.
|
| + if (message.type() == ViewHostMsg_GetMonitorColorProfile::ID)
|
| + *thread = BrowserThread::FILE;
|
| +#endif
|
| +}
|
| +
|
| bool RenderMessageFilter::OffTheRecord() const {
|
| return incognito_;
|
| }
|
| @@ -709,6 +721,10 @@ void RenderMessageFilter::OnGetHardwareInputChannelLayout(
|
| media::AudioManagerBase::kDefaultDeviceId);
|
| }
|
|
|
| +void RenderMessageFilter::OnGetMonitorColorProfile(std::vector<char>* profile) {
|
| + gfx::GetColorProfile(profile);
|
| +}
|
| +
|
| void RenderMessageFilter::OnDownloadUrl(const IPC::Message& message,
|
| const GURL& url,
|
| const content::Referrer& referrer,
|
|
|