diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 21:50:01 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 21:50:01 +0000 |
| commit | 32fc4ff7d286f7a6ee80d969672cdadaa8d3e8d0 (patch) | |
| tree | c7e59d81962c173d61083003c07819c2805fd042 /chrome/browser/extensions/api | |
| parent | 080245fa243e0c04ccea332660d3058f710a090c (diff) | |
| download | chromium_src-32fc4ff7d286f7a6ee80d969672cdadaa8d3e8d0.zip chromium_src-32fc4ff7d286f7a6ee80d969672cdadaa8d3e8d0.tar.gz chromium_src-32fc4ff7d286f7a6ee80d969672cdadaa8d3e8d0.tar.bz2 | |
Remove BrowserList::GetLastActive from extensions install dialog code by plumbing through the Browser window. In two places (file_manager_util.cc and download_crx_util.cc) there is no context so I left those with FindLastActiveWithProfile for now.
BUG=129187
Review URL: https://chromiumcodereview.appspot.com/10548057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api')
| -rw-r--r-- | chrome/browser/extensions/api/permissions/permissions_api.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/webstore_private/webstore_private_api.cc | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc index 0af5db5..747a74e 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api.cc @@ -203,7 +203,7 @@ bool RequestPermissionsFunction::RunImpl() { InstallUIAbort(true); } else { CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests); - install_ui_.reset(new ExtensionInstallPrompt(profile())); + install_ui_.reset(new ExtensionInstallPrompt(GetCurrentBrowser())); install_ui_->ConfirmPermissions( this, GetExtension(), requested_permissions_.get()); } diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 00f7e85..b6d32f2 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -197,7 +197,7 @@ bool InstallBundleFunction::RunImpl() { if (!ReadBundleInfo(extensions, &items)) return false; - bundle_ = new BundleInstaller(profile(), items); + bundle_ = new BundleInstaller(GetCurrentBrowser(), items); AddRef(); // Balanced in OnBundleInstallCompleted / OnBundleInstallCanceled. @@ -228,7 +228,6 @@ bool InstallBundleFunction::ReadBundleInfo(ListValue* extensions, void InstallBundleFunction::OnBundleInstallApproved() { bundle_->CompleteInstall( &(dispatcher()->delegate()->GetAssociatedWebContents()->GetController()), - GetCurrentBrowser(), this); } @@ -367,7 +366,7 @@ void BeginInstallWithManifestFunction::OnWebstoreParseSuccess( return; } - install_prompt_.reset(new ExtensionInstallPrompt(profile())); + install_prompt_.reset(new ExtensionInstallPrompt(GetCurrentBrowser())); install_prompt_->ConfirmWebstoreInstall(this, dummy_extension_, &icon_); // Control flow finishes up in InstallUIProceed or InstallUIAbort. } |
