third_party/WebKit/Source/web/WebSettingsImpl.cpp - Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/web/WebSettingsImpl.cpp

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)

Patch Set: Rebasing the fixes... Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/Source/web/WebSettingsImpl.cpp

diff --git a/third_party/WebKit/Source/web/WebSettingsImpl.cpp b/third_party/WebKit/Source/web/WebSettingsImpl.cpp

index 30e251d19ec48927346e02867c4d6d2883061bcb..45344de7ed8ba33b5c81edb7d8624321b92b5eae 100644

--- a/third_party/WebKit/Source/web/WebSettingsImpl.cpp

+++ b/third_party/WebKit/Source/web/WebSettingsImpl.cpp

@@ -62,7 +62,9 @@ WebSettingsImpl::WebSettingsImpl(Settings* settings,

void WebSettingsImpl::setFromStrings(const WebString& name,

const WebString& value) {

- m_settings->setFromStrings(name, value);

+ /* DO NOT SUBMIT - merge conflict marker.

+ * Please spell |setFromStrings|, not |SetFromStrings| below. */

+ settings_->setFromStrings(name, value);

}

void WebSettingsImpl::setStandardFontFamily(const WebString& font,