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 bf56362047cdd3389dc54e8b792660e1b31a45ad..bd3836fb71a4b1a907889110e757afe3d711148a 100644 |
--- a/chrome/renderer/chrome_render_thread_observer.cc |
+++ b/chrome/renderer/chrome_render_thread_observer.cc |
@@ -295,8 +295,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; |
@@ -324,17 +326,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) { |