910167 - Remove remaining uses of nsISessionStore in browser/base/

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[Dão Gottwald [:dao]]

+++ This bug was initially created as a clone of Bug #898732 +++

There are a few remaining uses of nsISessionStore in browser/base/ that we can treat like in bug 898732:

http://mxr.mozilla.org/mozilla-central/search?string=nsISessionStore&find=browser%2Fbase%2F

Comment 1

[Georgiana [:gia]]

Attachment: patch1

Comment 2

[Dão Gottwald [:dao]]

Comment on attachment 796811 [details] [diff] [review]
patch1

>--- a/browser/base/content/browser-places.js
>+++ b/browser/base/content/browser-places.js
>@@ -475,19 +475,17 @@ var PlacesCommandHook = {
> 
> // View for the history menu.
> function HistoryMenu(aPopupShowingEvent) {
>   // Workaround for Bug 610187.  The sidebar does not include all the Places
>   // views definitions, and we don't need them there.
>   // Defining the prototype inheritance in the prototype itself would cause
>   // browser.js to halt on "PlacesMenu is not defined" error.
>   this.__proto__.__proto__ = PlacesMenu.prototype;
>-  XPCOMUtils.defineLazyServiceGetter(this, "_ss",
>-                                     "@mozilla.org/browser/sessionstore;1",
>-                                     "nsISessionStore");
>+  XPCOMUtils.defineLazyServiceGetter(this, SessionStore);

That won't work. You need to replace all occurrences of 'this._ss' with 'SessionStore'.

Comment 3

[Georgiana [:gia]]

Attachment: patch2

Comment 4

[Dão Gottwald [:dao]]

Comment on attachment 796827 [details] [diff] [review]
patch2

>--- a/browser/base/content/browser-places.js
>+++ b/browser/base/content/browser-places.js
>@@ -475,30 +475,28 @@ var PlacesCommandHook = {
> 
> // View for the history menu.
> function HistoryMenu(aPopupShowingEvent) {
>   // Workaround for Bug 610187.  The sidebar does not include all the Places
>   // views definitions, and we don't need them there.
>   // Defining the prototype inheritance in the prototype itself would cause
>   // browser.js to halt on "PlacesMenu is not defined" error.
>   this.__proto__.__proto__ = PlacesMenu.prototype;
>-  XPCOMUtils.defineLazyServiceGetter(this, "_ss",
>-                                     "@mozilla.org/browser/sessionstore;1",
>-                                     "nsISessionStore");
>+  XPCOMUtils.defineLazyServiceGetter(this, SessionStore);

Remove this line, it's broken and unneeded. :)

r+ with that change, thanks!

Comment 5

[Georgiana [:gia]]

Attachment: patch3

Comment 6

[Dão Gottwald [:dao]]

https://hg.mozilla.org/integration/fx-team/rev/c0ec8c9f5f29

Comment 7

[Ed Morley [:emorley]]

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