summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-15 21:18:04 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-15 21:18:04 +0000
commit3076a2235240d42d52252c733a2b09ceebb17fe2 (patch)
tree3cdce63ea0f553b233ec8eed80bb06c8d1ed9892 /chrome/browser/extensions
parent6e9cc877909978d5880da6683e047f2da018d1a6 (diff)
downloadchromium_src-3076a2235240d42d52252c733a2b09ceebb17fe2.zip
chromium_src-3076a2235240d42d52252c733a2b09ceebb17fe2.tar.gz
chromium_src-3076a2235240d42d52252c733a2b09ceebb17fe2.tar.bz2
Mac: Fix inline extension install prompt
Installing inline extensions stopped working on Mac. In r161306 I switched the extension install prompt to be a constrained window. This requires a window to attach the install prompt onto. The inline install code path was not setting a parent window causing us not to show the prompt. Fix was to pass a window. BUG=155732 TEST=Navigate to http://chrome.angrybirds.com/ and choose "Install to play offline". Verified that the install prompt was shown. Review URL: https://chromiumcodereview.appspot.com/11145010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/webstore_standalone_installer.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc
index 84ce98c..e101a72 100644
--- a/chrome/browser/extensions/webstore_standalone_installer.cc
+++ b/chrome/browser/extensions/webstore_standalone_installer.cc
@@ -22,6 +22,7 @@
#include "content/public/browser/utility_process_host.h"
#include "content/public/browser/utility_process_host_client.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
#include "net/base/escape.h"
#include "net/base/load_flags.h"
#include "net/url_request/url_fetcher.h"
@@ -370,7 +371,10 @@ void WebstoreStandaloneInstaller::OnWebstoreParseSuccess(
return;
}
- install_ui_.reset(new ExtensionInstallPrompt(NULL, web_contents(), profile));
+ install_ui_.reset(new ExtensionInstallPrompt(
+ web_contents()->GetView()->GetTopLevelNativeWindow(),
+ web_contents(),
+ profile));
install_ui_->ConfirmStandaloneInstall(this, dummy_extension_, &icon_, prompt);
// Control flow finishes up in InstallUIProceed or InstallUIAbort.
}