| Index: chrome/renderer/chrome_render_thread_observer.cc
|
| diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc
|
| index ed486e977e3e1b8447bef543d4f3be50af831680..28321aa2cf9944f3992681eb4285c7ce1df80f6d 100644
|
| --- a/chrome/renderer/chrome_render_thread_observer.cc
|
| +++ b/chrome/renderer/chrome_render_thread_observer.cc
|
| @@ -294,8 +294,10 @@ bool ChromeRenderThreadObserver::OnControlMessageReceived(
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(ChromeRenderThreadObserver, message)
|
| IPC_MESSAGE_HANDLER(ChromeViewMsg_SetFieldTrialGroup, OnSetFieldTrialGroup)
|
| + // TODO(nigeltao): delete this handler when all senders of
|
| + // ChromeViewMsg_SetContentSettingRules have been converted to Mojo.
|
| IPC_MESSAGE_HANDLER(ChromeViewMsg_SetContentSettingRules,
|
| - OnSetContentSettingRules)
|
| + SetContentSettingRules)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -323,17 +325,17 @@ void ChromeRenderThreadObserver::SetInitialConfiguration(
|
| is_incognito_process_ = is_incognito_process;
|
| }
|
|
|
| +void ChromeRenderThreadObserver::SetContentSettingRules(
|
| + const RendererContentSettingRules& rules) {
|
| + content_setting_rules_ = rules;
|
| +}
|
| +
|
| void ChromeRenderThreadObserver::OnRendererInterfaceRequest(
|
| chrome::mojom::RendererConfigurationAssociatedRequest request) {
|
| DCHECK(!renderer_configuration_binding_.is_bound());
|
| renderer_configuration_binding_.Bind(std::move(request));
|
| }
|
|
|
| -void ChromeRenderThreadObserver::OnSetContentSettingRules(
|
| - const RendererContentSettingRules& rules) {
|
| - content_setting_rules_ = rules;
|
| -}
|
| -
|
| void ChromeRenderThreadObserver::OnSetFieldTrialGroup(
|
| const std::string& trial_name,
|
| const std::string& group_name) {
|
|
|