| Index: chrome/browser/extensions/extension_install_prompt.cc
|
| diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
|
| index eb37b8b74f639771aa680c909f257d666bb1e83b..0ff2c535143886acf1efca6921dab8f1360877c4 100644
|
| --- a/chrome/browser/extensions/extension_install_prompt.cc
|
| +++ b/chrome/browser/extensions/extension_install_prompt.cc
|
| @@ -151,7 +151,7 @@ bool AutoConfirmPrompt(ExtensionInstallPrompt::Delegate* delegate) {
|
| // the real implementations it's highly likely the message loop will be
|
| // pumping a few times before the user clicks accept or cancel.
|
| if (value == "accept") {
|
| - MessageLoop::current()->PostTask(
|
| + base::MessageLoop::current()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&ExtensionInstallPrompt::Delegate::InstallUIProceed,
|
| base::Unretained(delegate)));
|
| @@ -159,7 +159,7 @@ bool AutoConfirmPrompt(ExtensionInstallPrompt::Delegate* delegate) {
|
| }
|
|
|
| if (value == "cancel") {
|
| - MessageLoop::current()->PostTask(
|
| + base::MessageLoop::current()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&ExtensionInstallPrompt::Delegate::InstallUIAbort,
|
| base::Unretained(delegate),
|
| @@ -411,10 +411,9 @@ scoped_refptr<Extension>
|
| error);
|
| }
|
|
|
| -ExtensionInstallPrompt::ExtensionInstallPrompt(
|
| - content::WebContents* contents)
|
| +ExtensionInstallPrompt::ExtensionInstallPrompt(content::WebContents* contents)
|
| : record_oauth2_grant_(false),
|
| - ui_loop_(MessageLoop::current()),
|
| + ui_loop_(base::MessageLoop::current()),
|
| extension_(NULL),
|
| install_ui_(ExtensionInstallUI::Create(ProfileForWebContents(contents))),
|
| show_params_(contents),
|
| @@ -428,7 +427,7 @@ ExtensionInstallPrompt::ExtensionInstallPrompt(
|
| gfx::NativeWindow native_window,
|
| content::PageNavigator* navigator)
|
| : record_oauth2_grant_(false),
|
| - ui_loop_(MessageLoop::current()),
|
| + ui_loop_(base::MessageLoop::current()),
|
| extension_(NULL),
|
| install_ui_(ExtensionInstallUI::Create(profile)),
|
| show_params_(native_window, navigator),
|
| @@ -443,7 +442,7 @@ ExtensionInstallPrompt::~ExtensionInstallPrompt() {
|
| void ExtensionInstallPrompt::ConfirmBundleInstall(
|
| extensions::BundleInstaller* bundle,
|
| const PermissionSet* permissions) {
|
| - DCHECK(ui_loop_ == MessageLoop::current());
|
| + DCHECK(ui_loop_ == base::MessageLoop::current());
|
| bundle_ = bundle;
|
| permissions_ = permissions;
|
| delegate_ = bundle;
|
| @@ -457,7 +456,7 @@ void ExtensionInstallPrompt::ConfirmStandaloneInstall(
|
| const Extension* extension,
|
| SkBitmap* icon,
|
| const ExtensionInstallPrompt::Prompt& prompt) {
|
| - DCHECK(ui_loop_ == MessageLoop::current());
|
| + DCHECK(ui_loop_ == base::MessageLoop::current());
|
| extension_ = extension;
|
| permissions_ = extension->GetActivePermissions();
|
| delegate_ = delegate;
|
| @@ -483,7 +482,7 @@ void ExtensionInstallPrompt::ConfirmInstall(
|
| Delegate* delegate,
|
| const Extension* extension,
|
| const ShowDialogCallback& show_dialog_callback) {
|
| - DCHECK(ui_loop_ == MessageLoop::current());
|
| + DCHECK(ui_loop_ == base::MessageLoop::current());
|
| extension_ = extension;
|
| permissions_ = extension->GetActivePermissions();
|
| delegate_ = delegate;
|
| @@ -510,7 +509,7 @@ void ExtensionInstallPrompt::ConfirmInstall(
|
|
|
| void ExtensionInstallPrompt::ConfirmReEnable(Delegate* delegate,
|
| const Extension* extension) {
|
| - DCHECK(ui_loop_ == MessageLoop::current());
|
| + DCHECK(ui_loop_ == base::MessageLoop::current());
|
| extension_ = extension;
|
| permissions_ = extension->GetActivePermissions();
|
| delegate_ = delegate;
|
| @@ -523,7 +522,7 @@ void ExtensionInstallPrompt::ConfirmExternalInstall(
|
| Delegate* delegate,
|
| const Extension* extension,
|
| const ShowDialogCallback& show_dialog_callback) {
|
| - DCHECK(ui_loop_ == MessageLoop::current());
|
| + DCHECK(ui_loop_ == base::MessageLoop::current());
|
| extension_ = extension;
|
| permissions_ = extension->GetActivePermissions();
|
| delegate_ = delegate;
|
| @@ -537,7 +536,7 @@ void ExtensionInstallPrompt::ConfirmPermissions(
|
| Delegate* delegate,
|
| const Extension* extension,
|
| const PermissionSet* permissions) {
|
| - DCHECK(ui_loop_ == MessageLoop::current());
|
| + DCHECK(ui_loop_ == base::MessageLoop::current());
|
| extension_ = extension;
|
| permissions_ = permissions;
|
| delegate_ = delegate;
|
| @@ -550,7 +549,7 @@ void ExtensionInstallPrompt::ConfirmIssueAdvice(
|
| Delegate* delegate,
|
| const Extension* extension,
|
| const IssueAdviceInfo& issue_advice) {
|
| - DCHECK(ui_loop_ == MessageLoop::current());
|
| + DCHECK(ui_loop_ == base::MessageLoop::current());
|
| extension_ = extension;
|
| delegate_ = delegate;
|
| prompt_.set_type(PERMISSIONS_PROMPT);
|
| @@ -563,7 +562,7 @@ void ExtensionInstallPrompt::ConfirmIssueAdvice(
|
|
|
| void ExtensionInstallPrompt::ReviewPermissions(Delegate* delegate,
|
| const Extension* extension) {
|
| - DCHECK(ui_loop_ == MessageLoop::current());
|
| + DCHECK(ui_loop_ == base::MessageLoop::current());
|
| extension_ = extension;
|
| permissions_ = extension->GetActivePermissions();
|
| delegate_ = delegate;
|
|
|