chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js - Issue 2118503005: [MD settings] disable clear browsing data while it is running

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: chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js

Issue 2118503005: [MD settings] disable clear browsing data while it is running (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review changes 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

« chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.js ('K') | « chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.js ('k') | chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc » ('j') | chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js

diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js

index a374304bbeccff3459dc4982ebd92d0a460b319e..ab4f2141f454f8f3168c2c5de0ade4af7d30a909 100644

--- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js

+++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.js

@@ -76,8 +76,10 @@ Polymer({

this.updateCounterText_.bind(this));

this.browserProxy_ =

settings.ClearBrowsingDataBrowserProxyImpl.getInstance();

- this.browserProxy_.initialize();

- this.$.dialog.open();

+ this.browserProxy_.initialize().then(function(inProgress) {

+ this.clearingInProgress_ = inProgress;

Dan Beam 2016/07/06 22:13:06 this is a positive step

dschuyler 2016/07/07 01:25:33 This is now set in the listener, but the promise i

+ this.$.dialog.open();

+ }.bind(this));

/**