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/ui/cocoa/extensions/extension_install_dialog_controller.mm | |
| 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/ui/cocoa/extensions/extension_install_dialog_controller.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm index 0561ca2..313b8fb 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm @@ -89,7 +89,7 @@ void AppendRatingStarsShim(const gfx::ImageSkia* skiaImage, void* data) { @synthesize userCountField = userCountField_; - (id)initWithParentWindow:(NSWindow*)window - profile:(Profile*)profile + browser:(Browser*)browser delegate:(ExtensionInstallPrompt::Delegate*)delegate prompt:(const ExtensionInstallPrompt::Prompt&)prompt { NSString* nibpath = nil; @@ -117,7 +117,7 @@ void AppendRatingStarsShim(const gfx::ImageSkia* skiaImage, void* data) { if ((self = [super initWithWindowNibPath:nibpath owner:self])) { parentWindow_ = window; - profile_ = profile; + browser_ = browser; delegate_ = delegate; prompt_.reset(new ExtensionInstallPrompt::Prompt(prompt)); } @@ -135,7 +135,7 @@ void AppendRatingStarsShim(const gfx::ImageSkia* skiaImage, void* data) { - (IBAction)storeLinkClicked:(id)sender { GURL store_url(extension_urls::GetWebstoreItemDetailURLPrefix() + prompt_->extension()->id()); - browser::FindLastActiveWithProfile(profile_)->OpenURL(OpenURLParams( + browser_->OpenURL(OpenURLParams( store_url, Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false)); @@ -318,15 +318,9 @@ void AppendRatingStarsShim(const gfx::ImageSkia* skiaImage, void* data) { @end // ExtensionInstallDialogController void ShowExtensionInstallDialogImpl( - Profile* profile, + Browser* browser, ExtensionInstallPrompt::Delegate* delegate, const ExtensionInstallPrompt::Prompt& prompt) { - Browser* browser = browser::FindLastActiveWithProfile(profile); - if (!browser) { - delegate->InstallUIAbort(false); - return; - } - BrowserWindow* window = browser->window(); if (!window) { delegate->InstallUIAbort(false); @@ -338,7 +332,7 @@ void ShowExtensionInstallDialogImpl( ExtensionInstallDialogController* controller = [[ExtensionInstallDialogController alloc] initWithParentWindow:native_window - profile:profile + browser:browser delegate:delegate prompt:prompt]; |
