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

Unified Diff: chrome/browser/extensions/extension_disabled_ui.cc

Issue 307413002: Move ExtensionUninstallDialog into extensions namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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/extensions/extension_disabled_ui.cc
diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc
index fc550543881c3a59a980431b5ba5d87c68f3e75b..78b477d48b5b35a76eb6576e93afa7decc55e306 100644
--- a/chrome/browser/extensions/extension_disabled_ui.cc
+++ b/chrome/browser/extensions/extension_disabled_ui.cc
@@ -139,9 +139,10 @@ void ExtensionDisabledDialogDelegate::InstallUIAbort(bool user_initiated) {
// ExtensionDisabledGlobalError -----------------------------------------------
-class ExtensionDisabledGlobalError : public GlobalErrorWithStandardBubble,
- public content::NotificationObserver,
- public ExtensionUninstallDialog::Delegate {
+class ExtensionDisabledGlobalError
+ : public GlobalErrorWithStandardBubble,
+ public content::NotificationObserver,
+ public extensions::ExtensionUninstallDialog::Delegate {
public:
ExtensionDisabledGlobalError(ExtensionService* service,
const Extension* extension,
@@ -188,7 +189,7 @@ class ExtensionDisabledGlobalError : public GlobalErrorWithStandardBubble,
};
UserResponse user_response_;
- scoped_ptr<ExtensionUninstallDialog> uninstall_dialog_;
+ scoped_ptr<extensions::ExtensionUninstallDialog> uninstall_dialog_;
// Menu command ID assigned for this extension's error.
int menu_command_id_;
@@ -341,13 +342,15 @@ void ExtensionDisabledGlobalError::BubbleViewAcceptButtonPressed(
void ExtensionDisabledGlobalError::BubbleViewCancelButtonPressed(
Browser* browser) {
#if !defined(OS_ANDROID)
- uninstall_dialog_.reset(
- ExtensionUninstallDialog::Create(service_->profile(), browser, this));
+ uninstall_dialog_.reset(extensions::ExtensionUninstallDialog::Create(
+ service_->profile(), browser, this));
// Delay showing the uninstall dialog, so that this function returns
// immediately, to close the bubble properly. See crbug.com/121544.
- base::MessageLoop::current()->PostTask(FROM_HERE,
- base::Bind(&ExtensionUninstallDialog::ConfirmUninstall,
- uninstall_dialog_->AsWeakPtr(), extension_));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE,
+ base::Bind(&extensions::ExtensionUninstallDialog::ConfirmUninstall,
+ uninstall_dialog_->AsWeakPtr(),
+ extension_));
#endif // !defined(OS_ANDROID)
}
« no previous file with comments | « chrome/browser/extensions/extension_context_menu_model.cc ('k') | chrome/browser/extensions/extension_uninstall_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698