738804 - back out keyword.URL prompting changes

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[:Gavin Sharp [email: [e-mail]]]

Bug 718088 implemented a prompt for users whose keyword.URL pref was user-set. In discussing the approach taken in that bug, Asa/Sheila/Kev and I decided that we should focus first on consolidating our search prefs and making search engine selection more intuitive, before we start actively prompting users.

We're going to investigate other ways to help users whose searches were hijacked, and so it makes sense to get our search configuration story into a better state before we use up precious user-prompting opportunities.

Comment 1

[:Gavin Sharp [email: [e-mail]]]

Attachment: backout

This is a straight backout of the patches for bug 718088 and bug 736878, merged with the patch for bug 697006.

Comment 2

[Frank Yan (:fryn)]

Comment on attachment 608874 [details] [diff] [review]
backout

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

r+, with the fixed indentation. :)

Please cc me on future bugs that come out of this further investigation of search prefs.

::: browser/components/nsBrowserGlue.js
@@ -289,3 @@
>          }
> -        break;
> -    }

I think you might have removed the wrong closing brace, but syntactically it happened to work, or at least that's what Mercurial is telling me. :P Either way, please fix the indentation.

Comment 3

[:Gavin Sharp [email: [e-mail]]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/5bdd055f22b5

Comment 4

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/5bdd055f22b5

Comment 5

[Alex Keybl [:akeybl]]

Please prepare a backout for Aurora 13 as well. Thanks!

Comment 6

[:Gavin Sharp [email: [e-mail]]]

Attachment: aurora backout

[Approval Request Comment]
Bug 736878 didn't land on Aurora, so this is a clean backout of the original patch for bug 718088 (again, merged with bug 697006, and the brace merging issue fixed!).

Comment 7

[Alex Keybl [:akeybl]]

Comment on attachment 611892 [details] [diff] [review]
aurora backout

[Triage Comment]
Approved for Aurora 13.

Comment 8

[:Gavin Sharp [email: [e-mail]]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/2fe257c037f1

Comment 9

[Axel Hecht [:Pike]]

This changed strings, but only removed them, so this is fine. Worth calling that out, though.

Comment 10

[u279076]

Not sure if this is anything QA needs to verify so marking [qa-]. Please add [qa+] if there is something we can do here.