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

Side by Side Diff: chrome/browser/ui/panels/panel_settings_menu_model.cc

Issue 9960087: Revert 13676 - Revert 131665 - Add a preference for why an extension is disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/panels/panel_settings_menu_model.h" 5 #include "chrome/browser/ui/panels/panel_settings_menu_model.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 browser->OpenURL(params); 85 browser->OpenURL(params);
86 break; 86 break;
87 } 87 }
88 case COMMAND_CONFIGURE: 88 case COMMAND_CONFIGURE:
89 DCHECK(!extension->options_url().is_empty()); 89 DCHECK(!extension->options_url().is_empty());
90 browser->GetProfile()->GetExtensionProcessManager()->OpenOptionsPage( 90 browser->GetProfile()->GetExtensionProcessManager()->OpenOptionsPage(
91 extension, browser); 91 extension, browser);
92 break; 92 break;
93 case COMMAND_DISABLE: 93 case COMMAND_DISABLE:
94 browser->GetProfile()->GetExtensionService()->DisableExtension( 94 browser->GetProfile()->GetExtensionService()->DisableExtension(
95 extension->id()); 95 extension->id(), Extension::DISABLE_USER_ACTION);
96 break; 96 break;
97 case COMMAND_UNINSTALL: 97 case COMMAND_UNINSTALL:
98 // When the owning panel is being closed by the extension API, the 98 // When the owning panel is being closed by the extension API, the
99 // currently showing uninstall dialog will also be dismissed. 99 // currently showing uninstall dialog will also be dismissed.
100 extension_uninstall_dialog_.reset( 100 extension_uninstall_dialog_.reset(
101 ExtensionUninstallDialog::Create(browser->GetProfile(), this)); 101 ExtensionUninstallDialog::Create(browser->GetProfile(), this));
102 extension_uninstall_dialog_->ConfirmUninstall(extension); 102 extension_uninstall_dialog_->ConfirmUninstall(extension);
103 break; 103 break;
104 case COMMAND_MANAGE: 104 case COMMAND_MANAGE:
105 browser->ShowExtensionsTab(); 105 browser->ShowExtensionsTab();
106 break; 106 break;
107 default: 107 default:
108 NOTREACHED(); 108 NOTREACHED();
109 break; 109 break;
110 } 110 }
111 } 111 }
112 112
113 void PanelSettingsMenuModel::ExtensionUninstallAccepted() { 113 void PanelSettingsMenuModel::ExtensionUninstallAccepted() {
114 const Extension* extension = panel_->GetExtension(); 114 const Extension* extension = panel_->GetExtension();
115 DCHECK(extension); 115 DCHECK(extension);
116 116
117 panel_->browser()->GetProfile()->GetExtensionService()-> 117 panel_->browser()->GetProfile()->GetExtensionService()->
118 UninstallExtension(extension->id(), false, NULL); 118 UninstallExtension(extension->id(), false, NULL);
119 } 119 }
120 120
121 void PanelSettingsMenuModel::ExtensionUninstallCanceled() { 121 void PanelSettingsMenuModel::ExtensionUninstallCanceled() {
122 } 122 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698