Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4564)

Unified Diff: chrome/browser/extensions/extension_install_prompt.h

Issue 1527043002: [Extensions] Don't use ExtensionInstallPrompt subclasses for auto-confirmation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_install_prompt.h
diff --git a/chrome/browser/extensions/extension_install_prompt.h b/chrome/browser/extensions/extension_install_prompt.h
index 75c848873825c9a4a5ccb635008b35fa5fd81cbe..89463b145bdff3c17ccd00a0eaca7019f3448a84 100644
--- a/chrome/browser/extensions/extension_install_prompt.h
+++ b/chrome/browser/extensions/extension_install_prompt.h
@@ -322,15 +322,18 @@ class ExtensionInstallPrompt
// current permissions are used.
//
// We *MUST* eventually call either Proceed() or Abort() on |delegate|.
- virtual void ShowDialog(Delegate* delegate,
- const extensions::Extension* extension,
- const SkBitmap* icon,
- const ShowDialogCallback& show_dialog_callback);
- virtual void ShowDialog(Delegate* delegate,
- const extensions::Extension* extension,
- const SkBitmap* icon,
- scoped_ptr<Prompt> prompt,
- const ShowDialogCallback& show_dialog_callback);
+ void ShowDialog(Delegate* delegate,
+ const extensions::Extension* extension,
+ const SkBitmap* icon,
+ const ShowDialogCallback& show_dialog_callback);
+ void ShowDialog(Delegate* delegate,
+ const extensions::Extension* extension,
+ const SkBitmap* icon,
+ scoped_ptr<Prompt> prompt,
+ const ShowDialogCallback& show_dialog_callback);
+ // Declared virtual for testing purposes.
+ // Note: if all you want to do is automatically confirm or cancel, prefer
+ // ScopedTestDialogAutoConfirm from extension_dialog_auto_confirm.h
virtual void ShowDialog(
Delegate* delegate,
const extensions::Extension* extension,
@@ -346,6 +349,8 @@ class ExtensionInstallPrompt
// Installation failed. This is declared virtual for testing.
virtual void OnInstallFailure(const extensions::CrxInstallError& error);
+ bool did_call_show_dialog() const { return did_call_show_dialog_; }
+
protected:
friend class extensions::ExtensionWebstorePrivateApiTest;
friend class WebstoreStartupInstallUnpackFailureTest;
@@ -398,6 +403,9 @@ class ExtensionInstallPrompt
// Used to show the confirm dialog.
ShowDialogCallback show_dialog_callback_;
+ // Whether or not the |show_dialog_callback_| was called.
+ bool did_call_show_dialog_;
+
DISALLOW_COPY_AND_ASSIGN(ExtensionInstallPrompt);
};
« no previous file with comments | « chrome/browser/extensions/extension_browsertest.cc ('k') | chrome/browser/extensions/extension_install_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698