Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
index b92e52d602d25a9090d272ad76e8b92b69dbb01f..11c3021e4be8a7bc9a3e227fbb5eadbc952094cc 100644 |
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp |
@@ -569,8 +569,8 @@ WebVector<WebIconURL> WebLocalFrameImpl::iconURLs(int iconTypesMask) const { |
} |
void WebLocalFrameImpl::setContentSettingsClient( |
- WebContentSettingsClient* contentSettingsClient) { |
- m_contentSettingsClient = contentSettingsClient; |
+ WebContentSettingsClient* client) { |
+ m_contentSettingsClient.setClient(client); |
} |
void WebLocalFrameImpl::setSharedWorkerRepositoryClient( |
@@ -1562,7 +1562,6 @@ WebLocalFrameImpl::WebLocalFrameImpl( |
m_frameWidget(0), |
m_client(client), |
m_autofillClient(0), |
- m_contentSettingsClient(0), |
m_inputEventsScaleFactorForEmulation(1), |
m_interfaceProvider(interfaceProvider), |
m_interfaceRegistry(interfaceRegistry), |