Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Unified Diff: chrome/browser/extensions/extension_process_manager.cc

Issue 434046: Support for chrome.experimental.popup API in ExternalTabContainer views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_process_manager.cc
===================================================================
--- chrome/browser/extensions/extension_process_manager.cc (revision 34039)
+++ chrome/browser/extensions/extension_process_manager.cc (working copy)
@@ -49,6 +49,7 @@
}
ExtensionProcessManager::~ExtensionProcessManager() {
+ CloseBackgroundHosts();
DCHECK(background_hosts_.empty());
}
@@ -57,7 +58,8 @@
Browser* browser,
ViewType::Type view_type) {
DCHECK(extension);
- DCHECK(browser);
+ // A NULL browser may only be given for pop-up views.
+ DCHECK(browser || (!browser && view_type == ViewType::EXTENSION_POPUP));
ExtensionHost* host =
new ExtensionHost(extension, GetSiteInstanceForURL(url), url, view_type);
host->CreateView(browser);
@@ -68,7 +70,8 @@
ExtensionHost* ExtensionProcessManager::CreateView(const GURL& url,
Browser* browser,
ViewType::Type view_type) {
- DCHECK(browser);
+ // A NULL browser may only be given for pop-up views.
+ DCHECK(browser || (!browser && view_type == ViewType::EXTENSION_POPUP));
ExtensionsService* service =
browsing_instance_->profile()->GetExtensionsService();
if (service) {

Powered by Google App Engine
This is Rietveld 408576698