735557 - Add about:preferences to the inContentWhitelist

Status: RESOLVED FIXED

(Firefox :: Settings UI, defect)

Description

[Jared Wein [:jaws] (please needinfo? me)]

The in-content preferences should be rendered the same way as about:addons, without the navigation toolbar.

To do this

1) Add a testcase for about:preferences to test_disablechrome.js (http://mxr.mozilla.org/mozilla-central/source/browser/base/content/test/browser_disablechrome.js#141). This is similar to the work that was done for bug 716464.
2) Run the test to make sure that the test fails for about:preferences.
3) Add about:preferences to the inContentWhitelist here: http://mxr.mozilla.org/mozilla-central/source/browser/base/content/browser.js#4425
4) Run the test to make sure that the test passes for about:preferences.

Comment 1

[Jon Rietveld]

Attachment: in-content preferences disable toolbar test

In this patch I believe I have the test failing correctly.

Comment 2

[Jared Wein [:jaws] (please needinfo? me)]

Comment on attachment 606105 [details] [diff] [review]
in-content preferences disable toolbar test

Review of attachment 606105 [details] [diff] [review]:
-----------------------------------------------------------------

This looks good.

Comment 3

[Jon Rietveld]

Attachment: remove toolbar

I have added about:preferences to the inContentWhitelist, but the new tests are still failing and I cannot figure out why. Any feedback would be greatly appreciated!

Comment 4

[Jon Rietveld]

Attachment: remove toolbar for in-content preferences

Everything appears to be working correctly! All tests pass :)

Comment 5

[Jared Wein [:jaws] (please needinfo? me)]

Comment on attachment 606416 [details] [diff] [review]
remove toolbar for in-content preferences

Review of attachment 606416 [details] [diff] [review]:
-----------------------------------------------------------------

Gah, so many whitespace changes! They are for the better though, so we could undo the whitespace fixes or leave them. I'm fine with the fixes staying. r=me with Blair's approval.

Comment 6

[Jon Rietveld]

yea, Blair said the same thing, duno how those happened :/

Comment 7

[Blair McBride [:Unfocused] (UNAVAILABLE)]

Comment on attachment 606416 [details] [diff] [review]
remove toolbar for in-content preferences

Review of attachment 606416 [details] [diff] [review]:
-----------------------------------------------------------------

Lots of unrelated whitespace changes in browser.js :(

::: browser/base/content/browser.js
@@ +4422,5 @@
>    startTime: 0,
>    statusText: "",
>    isBusy: false,
> +  inContentWhitelist: ["about:addons", "about:permissions",
> +    "about:sync-progress", "about:preferences"],

Indent the second line to be lined up with the first item in the array on the first line.

::: browser/base/content/test/browser_disablechrome.js
@@ +195,5 @@
> +  test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_preferences_test_5);
> +}
> +
> +// Should not hide the chrome
> +function run_chrome_about_preferences_test_5() {

Keep the function naming consistent with the rest of the file - run_chrome_about_test_5.
Ditto for run_chrome_about_test_6.

Comment 8

[Blair McBride [:Unfocused] (UNAVAILABLE)]

(In reply to Jared Wein [:jaws] from comment #5)
> They are for the better though, so we could
> undo the whitespace fixes or leave them.

I'd rather not have them land with this, on the odd change that this gets backed out at any stage (unnecessary churn in related code).

Comment 9

[Blair McBride [:Unfocused] (UNAVAILABLE)]

Comment on attachment 606416 [details] [diff] [review]
remove toolbar for in-content preferences

(Stupid bugzilla...)

Comment 10

[Jon Rietveld]

Attachment: remove toolbar for in-content preferences

Fixed naming issues and removed unrelated whitespace from browser.js :)

Comment 11

[Jared Wein [:jaws] (please needinfo? me)]

Comment on attachment 606571 [details] [diff] [review]
remove toolbar for in-content preferences

Review of attachment 606571 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good. r=me with Blair's approval :P

Comment 12

[Jared Wein [:jaws] (please needinfo? me)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/b2d23fc61c6f

Comment 13

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/b2d23fc61c6f