diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 21:57:49 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 21:57:49 +0000 |
| commit | d7e9a8609d36bee7a8510dc95eec201ed44d37e0 (patch) | |
| tree | 0a8536eaff24d0de0cf4a7e9d7e68dc409c98ff3 /chrome/browser/views | |
| parent | 230d2fd2e1cafaab5cd5e4d2a9f64b4ae272550a (diff) | |
| download | chromium_src-d7e9a8609d36bee7a8510dc95eec201ed44d37e0.zip chromium_src-d7e9a8609d36bee7a8510dc95eec201ed44d37e0.tar.gz chromium_src-d7e9a8609d36bee7a8510dc95eec201ed44d37e0.tar.bz2 | |
Kill Extension::RuntimeData and move its guts to ExtensionsService.
ImageCache remains on Extension, on the expectation that it will eventually be
loaded at startup.
BUG=56558
TEST=no functional change
Review URL: http://codereview.chromium.org/4132005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/browser_actions_container.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc index fb50270..b630806 100644 --- a/chrome/browser/views/browser_actions_container.cc +++ b/chrome/browser/views/browser_actions_container.cc @@ -915,7 +915,8 @@ void BrowserActionsContainer::BrowserActionAdded(const Extension* extension, // Enlarge the container if it was already at maximum size and we're not in // the middle of upgrading. - if ((model_->GetVisibleIconCount() < 0) && !extension->being_upgraded()) { + if ((model_->GetVisibleIconCount() < 0) && + !profile_->GetExtensionsService()->IsBeingUpgraded(extension)) { suppress_chevron_ = true; SaveDesiredSizeAndAnimate(Tween::LINEAR, visible_actions + 1); } else { @@ -940,7 +941,7 @@ void BrowserActionsContainer::BrowserActionRemoved(const Extension* extension) { // If the extension is being upgraded we don't want the bar to shrink // because the icon is just going to get re-added to the same location. - if (extension->being_upgraded()) + if (profile_->GetExtensionsService()->IsBeingUpgraded(extension)) return; if (browser_action_views_.size() > visible_actions) { |