chrome/browser/resources/options/controlled_setting.js - Issue 553573003: Compile chrome://settings, part 3: 167 proper errors left

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/options/controlled_setting.js

Issue 553573003: Compile chrome://settings, part 3: 167 proper errors left (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@G_options_errors_1

Patch Set: mark narrow type in createItem JSDoc Created 6 years, 3 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/options/confirm_dialog.js ('K') | « chrome/browser/resources/options/confirm_dialog.js ('k') | chrome/browser/resources/options/deletable_item_list.js » ('j') | chrome/browser/resources/options/supervised_user_list.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options/controlled_setting.js

diff --git a/chrome/browser/resources/options/controlled_setting.js b/chrome/browser/resources/options/controlled_setting.js

index df428faea98fc5c99c450b330199696aa81e60be..78a630e06454569133a09c3fab60196d47f2fa96 100644

--- a/chrome/browser/resources/options/controlled_setting.js

+++ b/chrome/browser/resources/options/controlled_setting.js

@@ -67,14 +67,14 @@ cr.define('options', function() {

this.extensionName = event.value.extension.name;

}

} else {

- this.controlledBy = null;

+ this.controlledBy = '';

}

} else if (event.value.recommendedValue != undefined) {

this.controlledBy =

!this.value || String(event.value.recommendedValue) == this.value ?

- 'hasRecommendation' : null;

+ 'hasRecommendation' : '';

Dan Beam 2014/09/11 02:53:09 nit: indent + 4\s more

Vitaly Pavlenko 2014/09/11 04:16:25 This way?

} else {

- this.controlledBy = null;

+ this.controlledBy = '';

}