| OLD | NEW |
| 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/webui/extensions/extension_settings_handler.h" | 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/base64.h" | 8 #include "base/base64.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 | 576 |
| 577 if (enable_str == "true") { | 577 if (enable_str == "true") { |
| 578 ExtensionPrefs* prefs = extension_service_->extension_prefs(); | 578 ExtensionPrefs* prefs = extension_service_->extension_prefs(); |
| 579 if (prefs->DidExtensionEscalatePermissions(extension_id)) { | 579 if (prefs->DidExtensionEscalatePermissions(extension_id)) { |
| 580 extensions::ShowExtensionDisabledDialog( | 580 extensions::ShowExtensionDisabledDialog( |
| 581 extension_service_, Profile::FromWebUI(web_ui()), extension); | 581 extension_service_, Profile::FromWebUI(web_ui()), extension); |
| 582 } else { | 582 } else { |
| 583 extension_service_->EnableExtension(extension_id); | 583 extension_service_->EnableExtension(extension_id); |
| 584 } | 584 } |
| 585 } else { | 585 } else { |
| 586 extension_service_->DisableExtension(extension_id); | 586 extension_service_->DisableExtension( |
| 587 extension_id, Extension::DISABLE_USER_ACTION); |
| 587 } | 588 } |
| 588 } | 589 } |
| 589 | 590 |
| 590 void ExtensionSettingsHandler::HandleEnableIncognitoMessage( | 591 void ExtensionSettingsHandler::HandleEnableIncognitoMessage( |
| 591 const ListValue* args) { | 592 const ListValue* args) { |
| 592 CHECK_EQ(2U, args->GetSize()); | 593 CHECK_EQ(2U, args->GetSize()); |
| 593 std::string extension_id, enable_str; | 594 std::string extension_id, enable_str; |
| 594 CHECK(args->GetString(0, &extension_id)); | 595 CHECK(args->GetString(0, &extension_id)); |
| 595 CHECK(args->GetString(1, &enable_str)); | 596 CHECK(args->GetString(1, &enable_str)); |
| 596 const Extension* extension = | 597 const Extension* extension = |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 812 if (!extension_uninstall_dialog_.get()) { | 813 if (!extension_uninstall_dialog_.get()) { |
| 813 extension_uninstall_dialog_.reset( | 814 extension_uninstall_dialog_.reset( |
| 814 ExtensionUninstallDialog::Create(Profile::FromWebUI(web_ui()), this)); | 815 ExtensionUninstallDialog::Create(Profile::FromWebUI(web_ui()), this)); |
| 815 } | 816 } |
| 816 return extension_uninstall_dialog_.get(); | 817 return extension_uninstall_dialog_.get(); |
| 817 } | 818 } |
| 818 | 819 |
| 819 void ExtensionSettingsHandler::InspectExtensionHost(ExtensionHost* host) { | 820 void ExtensionSettingsHandler::InspectExtensionHost(ExtensionHost* host) { |
| 820 DevToolsWindow::OpenDevToolsWindow(host->render_view_host()); | 821 DevToolsWindow::OpenDevToolsWindow(host->render_view_host()); |
| 821 } | 822 } |
| OLD | NEW |