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

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.h

Issue 12303030: Merge 182576 to M26 beta branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 years, 10 months 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/ui/webui/extensions/extension_settings_handler.h
===================================================================
--- chrome/browser/ui/webui/extensions/extension_settings_handler.h (revision 183257)
+++ chrome/browser/ui/webui/extensions/extension_settings_handler.h (working copy)
@@ -12,6 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/prefs/public/pref_change_registrar.h"
#include "base/scoped_observer.h"
+#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_install_ui.h"
#include "chrome/browser/extensions/extension_uninstall_dialog.h"
#include "chrome/browser/extensions/extension_warning_service.h"
@@ -66,6 +67,7 @@
public content::NotificationObserver,
public content::WebContentsObserver,
public ui::SelectFileDialog::Listener,
+ public ExtensionInstallPrompt::Delegate,
public ExtensionUninstallDialog::Delegate,
public extensions::ExtensionWarningService::Observer,
public base::SupportsWeakPtr<ExtensionSettingsHandler> {
@@ -121,6 +123,10 @@
// extensions::ExtensionWarningService::Observer implementation.
virtual void ExtensionWarningsChanged() OVERRIDE;
+ // ExtensionInstallPrompt::Delegate implementation.
+ virtual void InstallUIProceed() OVERRIDE;
+ virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
+
// Helper method that reloads all unpacked extensions.
void ReloadUnpackedExtensions();
@@ -157,6 +163,9 @@
// Callback for "options" message.
void HandleOptionsMessage(const base::ListValue* args);
+ // Callback for "permissions" message.
+ void HandlePermissionsMessage(const base::ListValue* args);
+
// Callback for "showButton" message.
void HandleShowButtonMessage(const base::ListValue* args);
@@ -245,6 +254,9 @@
// one to abort.
scoped_ptr<extensions::RequirementsChecker> requirements_checker_;
+ // The UI for showing what permissions the extension has.
+ scoped_ptr<ExtensionInstallPrompt> prompt_;
+
ScopedObserver<extensions::ExtensionWarningService,
extensions::ExtensionWarningService::Observer>
warning_service_observer_;

Powered by Google App Engine
This is Rietveld 408576698