| Index: android_webview/native/aw_settings.cc
|
| diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
|
| index 56bb3a8d8a695353798139980a343f8f35cd586c..753a9e1292cf210895af6e80a266e51b36de8c5a 100644
|
| --- a/android_webview/native/aw_settings.cc
|
| +++ b/android_webview/native/aw_settings.cc
|
| @@ -50,13 +50,13 @@ void PopulateFixedWebPreferences(WebPreferences* web_prefs) {
|
| web_prefs->should_clear_document_background = false;
|
| }
|
|
|
| -}; // namespace
|
| +const void* const kAwSettingsUserDataKey = &kAwSettingsUserDataKey;
|
|
|
| -const void* kAwSettingsUserDataKey = &kAwSettingsUserDataKey;
|
| +}; // namespace
|
|
|
| class AwSettingsUserData : public base::SupportsUserData::Data {
|
| public:
|
| - AwSettingsUserData(AwSettings* ptr) : settings_(ptr) {}
|
| + explicit AwSettingsUserData(AwSettings* ptr) : settings_(ptr) {}
|
|
|
| static AwSettings* GetSettings(content::WebContents* web_contents) {
|
| if (!web_contents)
|
|
|