diff options
| author | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 08:10:02 +0000 |
|---|---|---|
| committer | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 08:10:02 +0000 |
| commit | f04680cdce9b6969d01823e7da530739b18eb05c (patch) | |
| tree | 0550e17f5feb58d148bc56a475aee52724d5d4bd /chrome/browser/task_manager | |
| parent | fb6e65d7c455f351f220805f25478890ae3464f7 (diff) | |
| download | chromium_src-f04680cdce9b6969d01823e7da530739b18eb05c.zip chromium_src-f04680cdce9b6969d01823e7da530739b18eb05c.tar.gz chromium_src-f04680cdce9b6969d01823e7da530739b18eb05c.tar.bz2 | |
Revert 110262 - Have ExtensionHost use TabContents instead of RenderViewHost. Try #2.
The first landing broke popups on the Mac. Specifically, the auto-resizing of TabContents interfered with how ExtensionViewMac tried to resize itself, causing an infinite feedback loop. Also, we need to defer updating the size of the container until the ExtensionHost is loaded so that we don't display an empty window.
BUG=84146
TEST=extensions still work
Review URL: http://codereview.chromium.org/8498022
TBR=mpcomplete@chromium.org
Review URL: http://codereview.chromium.org/8520036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
| -rw-r--r-- | chrome/browser/task_manager/task_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/task_manager/task_manager_resource_providers.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index d5ddaf41..914e3f0 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -1109,7 +1109,7 @@ int CountExtensionBackgroundPagesForProfile(Profile* profile) { for (ExtensionProcessManager::const_iterator iter = manager->begin(); iter != manager->end(); ++iter) { - if ((*iter)->extension_host_type() == + if ((*iter)->GetRenderViewType() == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE) { count++; } diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index c9d57e0..ee35c31 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -1121,7 +1121,7 @@ const Extension* TaskManagerExtensionProcessResource::GetExtension() const { } bool TaskManagerExtensionProcessResource::IsBackground() const { - return extension_host_->extension_host_type() == + return extension_host_->GetRenderViewType() == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE; } |