Making ShowExtensionInstallDialog a callback

chrome/browser/extensions/api/webstore_private/webstore_private_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
-#include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 290 matching lines @@
       &error);
 
   if (!dummy_extension_) {
     OnWebstoreParseFailure(id_, WebstoreInstallHelper::Delegate::MANIFEST_ERROR,
                            kInvalidManifestError);
     return;
   }
 
   install_prompt_.reset(
       chrome::CreateExtensionInstallPromptWithBrowser(GetCurrentBrowser()));
-  install_prompt_->ConfirmWebstoreInstall(this, dummy_extension_, &icon_);
+  install_prompt_->ConfirmWebstoreInstall(
+      this,
+      dummy_extension_,
+      &icon_,
+      ExtensionInstallPrompt::ShowDialogCallback());

[Aaron Boodman, 2012/10/11 20:28:50]

This is super confusing. I thought this was a function call or something, but
it's creating an empty Callback instance.

I guess this is because callbacks must be passed by value, so you can't pass
NULL?

In that case, I think it is better the way you had -- with a method somewhere to
get the default impl of this callback.

Sorry for the flip flop.

[sail, 2012/10/11 21:18:47]

Changed to ExtensionInstallPrompt::GetDefaultShowDialogCallback() instead.

   // Control flow finishes up in InstallUIProceed or InstallUIAbort.
 }
 
 void BeginInstallWithManifestFunction::OnWebstoreParseFailure(
     const std::string& id,
     WebstoreInstallHelper::Delegate::InstallHelperResultCode result_code,
     const std::string& error_message) {
   CHECK_EQ(id_, id);
 
   // Map from WebstoreInstallHelper's result codes to ours.
@@ skipping 166 matching lines @@
   feature_checker_->CheckGPUFeatureAvailability();
   return true;
 }
 
 void GetWebGLStatusFunction::OnFeatureCheck(bool feature_allowed) {
   CreateResult(feature_allowed);
   SendResponse(true);
 }
 
 }  // namespace extensions