summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/extensions
diff options
context:
space:
mode:
authorerikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 15:45:29 +0000
committererikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-24 15:45:29 +0000
commitc6e4a341394648def8e9a5b0c73ef4979f188bad (patch)
tree1b79b0557b4a7c9ba5ad378bad5e8c3d320f0662 /chrome/browser/views/extensions
parent67dc31d0939c071af8f583d4810c623d52b24364 (diff)
downloadchromium_src-c6e4a341394648def8e9a5b0c73ef4979f188bad.zip
chromium_src-c6e4a341394648def8e9a5b0c73ef4979f188bad.tar.gz
chromium_src-c6e4a341394648def8e9a5b0c73ef4979f188bad.tar.bz2
Clean up a few startup and shutdown dependencies which should fix some of the extension
browser_tests. Specifically, this includes: * make ExtensionsService own ExtensionProcessManager so that they have the same lifetime * git rid of notifications from unload all to avoid treating these notifications like real unload / uninstall events * fix teardown logic in ExtensionShelfModelTest * ExtensionView removes itself from the view hierarchy on destruction * ExtensionProcessManager waits for EXTENSIONS_READY to load background pages BUG=15080 TEST=browser_tests.exe --gtest_filter=ExtensionShelfModelTest Review URL: http://codereview.chromium.org/147051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/extensions')
-rw-r--r--chrome/browser/views/extensions/extension_view.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/views/extensions/extension_view.cc b/chrome/browser/views/extensions/extension_view.cc
index 2050aa0..120fb3c 100644
--- a/chrome/browser/views/extensions/extension_view.cc
+++ b/chrome/browser/views/extensions/extension_view.cc
@@ -20,6 +20,9 @@ ExtensionView::ExtensionView(ExtensionHost* host, Browser* browser)
}
ExtensionView::~ExtensionView() {
+ View* parent = GetParent();
+ if (parent)
+ parent->RemoveChildView(this);
CleanUp();
}