summaryrefslogtreecommitdiffstats
path: root/apps/app_window_contents.cc
diff options
context:
space:
mode:
authortmdiep@chromium.org <tmdiep@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-26 06:33:10 +0000
committertmdiep@chromium.org <tmdiep@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-26 06:33:10 +0000
commit5b3ee856164dbca8a501a7e8c20fb622e5c045d2 (patch)
tree91242ed5556235835531a7267d7b22431c8a3bcb /apps/app_window_contents.cc
parent38e18fc62f56507e057cc33bc008428604dad899 (diff)
downloadchromium_src-5b3ee856164dbca8a501a7e8c20fb622e5c045d2.zip
chromium_src-5b3ee856164dbca8a501a7e8c20fb622e5c045d2.tar.gz
chromium_src-5b3ee856164dbca8a501a7e8c20fb622e5c045d2.tar.bz2
Fixed crash when chrome.runtime.reload() is called with app windows open
app_window_contents.cc: Use host_->extension_id() as host_->extension() is freed when the app is reloaded. This fixes the crash. extension_process_manager.cc/h: Unregister render view hosts when the old extension instance is unloaded, since the background page data is erased. This avoids a DCHECK failure in DecrementLazyKeepaliveCount() due to an excess decrement when the old render view is destroyed. extension_service.h: Changed potentially misleading parameter name, as the function uses the extension ID, not the name. BUG=295266 TEST=See bug description for steps to reproduce crash Review URL: https://codereview.chromium.org/24177003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_window_contents.cc')
-rw-r--r--apps/app_window_contents.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_window_contents.cc b/apps/app_window_contents.cc
index d163c2c..7b88e67 100644
--- a/apps/app_window_contents.cc
+++ b/apps/app_window_contents.cc
@@ -96,7 +96,7 @@ void AppWindowContents::NativeWindowChanged(
content::RenderViewHost* rvh = web_contents_->GetRenderViewHost();
rvh->Send(new ExtensionMsg_MessageInvoke(rvh->GetRoutingID(),
- host_->extension()->id(),
+ host_->extension_id(),
"app.window",
"updateAppWindowProperties",
args,