third_party/WebKit/Source/web/WebSettingsImpl.cpp - Issue 1860743002: Add a flag to change when android's progress bar completes

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 1860743002: Add a flag to change when android's progress bar completes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix a bad merge Created 4 years, 6 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:

View side-by-side diff with in-line comments

Download patch

« content/public/common/web_preferences.h ('K') | « third_party/WebKit/Source/web/WebSettingsImpl.h ('k') | third_party/WebKit/public/web/WebSettings.h » ('j') | third_party/WebKit/public/web/WebSettings.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1c385f4eaf03fbcb9ef69a4c771d48a40dfe8296..1b0004246dc7b7b47bda70d9185a2f4108914da6 100644

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

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

@@ -287,6 +287,11 @@ void WebSettingsImpl::setShouldReuseGlobalForUnownedMainFrame(bool enabled)

m_settings->setShouldReuseGlobalForUnownedMainFrame(enabled);

}

+void WebSettingsImpl::setProgressBarCompletion(ProgressBarCompletion progressBarCompletion)

+ m_settings->setProgressBarCompletion(static_cast<blink::ProgressBarCompletion>(progressBarCompletion));

void WebSettingsImpl::setPluginsEnabled(bool enabled)

{

m_devToolsEmulator->setPluginsEnabled(enabled);