summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_host.h
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 18:49:28 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 18:49:28 +0000
commite5ed44e3fb8e120b36a666d1c65fdfa750b6c579 (patch)
tree0a8bc0ffb074ae1f9f81cc6d1335df049ec13a49 /chrome/browser/extensions/extension_host.h
parent24f46397f8a0e0b02167ab0807f13ad5637c4345 (diff)
downloadchromium_src-e5ed44e3fb8e120b36a666d1c65fdfa750b6c579.zip
chromium_src-e5ed44e3fb8e120b36a666d1c65fdfa750b6c579.tar.gz
chromium_src-e5ed44e3fb8e120b36a666d1c65fdfa750b6c579.tar.bz2
Revert old change that created an ExtensionHost's RenderView asynchronously.
With jam's recent change to spawn renderers from a background thread, ExtensionHost spawns processes asynchronously for free. Reverting this change also fixes a bug due to an extension popup closing before the next one can be created. BUG=28049 Review URL: http://codereview.chromium.org/399098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_host.h')
-rw-r--r--chrome/browser/extensions/extension_host.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 9407b85..552bc8c 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -44,8 +44,6 @@ class ExtensionHost : public ExtensionPopupHost::PopupDelegate,
public NotificationObserver,
public JavaScriptMessageBoxClient {
public:
- class ProcessCreationQueue;
-
// Enable DOM automation in created render view hosts.
static void EnableDOMAutomation() { enable_dom_automation_ = true; }
@@ -84,10 +82,10 @@ class ExtensionHost : public ExtensionPopupHost::PopupDelegate,
// Returns true if the render view is initialized and didn't crash.
bool IsRenderViewLive() const;
- // Prepares to initializes our RenderViewHost by creating its RenderView and
- // navigating to this host's url. Uses host_view for the RenderViewHost's view
- // (can be NULL). This happens delayed to avoid locking the UI.
- void CreateRenderViewSoon(RenderWidgetHostView* host_view);
+ // Initializes our RenderViewHost by creating its RenderView and navigating
+ // to this host's url. Uses host_view for the RenderViewHost's view (can be
+ // NULL).
+ void CreateRenderView(RenderWidgetHostView* host_view);
// Sets |url_| and navigates |render_view_host_|.
void NavigateToURL(const GURL& url);
@@ -158,15 +156,10 @@ class ExtensionHost : public ExtensionPopupHost::PopupDelegate,
virtual TabContents* AsTabContents() { return NULL; }
private:
- friend class ProcessCreationQueue;
-
// Whether to allow DOM automation for created RenderViewHosts. This is used
// for testing.
static bool enable_dom_automation_;
- // Actually create the RenderView for this host. See CreateRenderViewSoon.
- void CreateRenderViewNow();
-
// ExtensionFunctionDispatcher::Delegate
// If this ExtensionHost has a view, this returns the Browser that view is a
// part of. If this is a global background page, we use the active Browser