726279 - Generalize use of Services.jsm in nsSearchService

Status: RESOLVED FIXED

(Firefox :: Search, enhancement)

Description

[David Teller [:Yoric] - still alive but not very active]

Followup to bug 699856.

Comment 1

[David Teller [:Yoric] - still alive but not very active]

nsSearchService.js was written before Services.jsm . Now that we have Services.jsm, we can simplify code in a few places.

Comment 2

[Raymond Lee [:raymondlee]]

Attachment: v1

Comment 3

[Dão Gottwald [:dao]]

Comment on attachment 619017 [details] [diff] [review]
v1

> let _dirSvc = null;
> function getDir(aKey, aIFace) {
>   if (!aKey)
>     FAIL("getDir requires a directory key!");
> 
>   if (!_dirSvc)
>-    _dirSvc = Cc["@mozilla.org/file/directory_service;1"].
>-               getService(Ci.nsIProperties);
>+    _dirSvc = Services.dirsvc;
>   return _dirSvc.get(aKey, aIFace || Ci.nsIFile);
> }

>+      var sbs = Services.strings;
> 
>       var brandBundle = sbs.createBundle(BRAND_BUNDLE);
>       var brandName = brandBundle.GetStringFromName("brandShortName");
> 
>       var searchBundle = sbs.createBundle(SEARCH_BUNDLE);

>+      var ss = Services.search;
>       if (ss.getEngineByName(aEngine.name)) {
>         if (aEngine._confirm)
>           onError("error_duplicate_engine_msg", "error_invalid_engine_title");
> 
>         LOG("_onLoad: duplicate engine found, bailing");
>         return;
>       }

_dirSvc, sbs and ss are unnecessary.

Comment 4

[Raymond Lee [:raymondlee]]

Attachment: v2

Removed _dirSvc, sbs and ss.

Comment 5

[David Teller [:Yoric] - still alive but not very active]

Comment on attachment 619046 [details] [diff] [review]
v2

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

Looks good to me. If this passes tests, you have my r+, but I defer to gavin for the final word.

Comment 6

[Dão Gottwald [:dao]]

Comment on attachment 619046 [details] [diff] [review]
v2

stealing... four reviewing eyes should be sufficient for this

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/6606ae2e48d4

Also, to make life easier for those checking in patches on your behalf, please follow the directions below for future patches you submit. Thanks!
https://developer.mozilla.org/en/Mercurial_FAQ#How_can_I_generate_a_patch_for_somebody_else_to_check-in_for_me.3F
https://developer.mozilla.org/en/Creating_a_patch_that_can_be_checked_in

Comment 8

[Ryan VanderMeulen [:RyanVM]]

http://hg.mozilla.org/mozilla-central/rev/6606ae2e48d4