From d593f7da2689fafe2b9ccffac4881e75f35a1a01 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Sat, 10 Nov 2012 10:32:35 -0800 Subject: [PATCH] Bug 802366 - Prelude, part 1: Rename in-process-browser-frame-shown to in-process-browser-or-app-frame-shown. r=bz --- content/base/src/nsFrameLoader.cpp | 2 +- dom/browser-element/BrowserElementParent.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp index b59ae1483006..bbf60ef88520 100644 --- a/content/base/src/nsFrameLoader.cpp +++ b/content/base/src/nsFrameLoader.cpp @@ -1620,7 +1620,7 @@ nsFrameLoader::MaybeCreateDocShell() nsCOMPtr os = services::GetObserverService(); if (os) { os->NotifyObservers(NS_ISUPPORTS_CAST(nsIFrameLoader*, this), - "in-process-browser-frame-shown", NULL); + "in-process-browser-or-app-frame-shown", NULL); } if (mMessageManager) { diff --git a/dom/browser-element/BrowserElementParent.js b/dom/browser-element/BrowserElementParent.js index bc67c5b48e8b..7580aabbfddb 100644 --- a/dom/browser-element/BrowserElementParent.js +++ b/dom/browser-element/BrowserElementParent.js @@ -120,7 +120,7 @@ BrowserElementParentFactory.prototype = { var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService); os.addObserver(this, 'remote-browser-frame-shown', /* ownsWeak = */ true); - os.addObserver(this, 'in-process-browser-frame-shown', /* ownsWeak = */ true); + os.addObserver(this, 'in-process-browser-or-app-frame-shown', /* ownsWeak = */ true); }, _browserFramesPrefEnabled: function() { @@ -161,7 +161,7 @@ BrowserElementParentFactory.prototype = { case 'remote-browser-frame-shown': this._observeRemoteBrowserFrameShown(subject); break; - case 'in-process-browser-frame-shown': + case 'in-process-browser-or-app-frame-shown': this._observeInProcessBrowserFrameShown(subject); break; case 'content-document-global-created':