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

Side by Side Diff: chrome/browser/extensions/extensions_ui.cc

Issue 3151033: Fix a bug where you could not uninstall a disabled extension. (Closed)
Patch Set: Created 10 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/extensions/extensions_ui.h" 5 #include "chrome/browser/extensions/extensions_ui.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 MaybeUpdateAfterNotification(); 702 MaybeUpdateAfterNotification();
703 break; 703 break;
704 default: 704 default:
705 NOTREACHED(); 705 NOTREACHED();
706 } 706 }
707 } 707 }
708 708
709 Extension* ExtensionsDOMHandler::GetExtension(const ListValue* args) { 709 Extension* ExtensionsDOMHandler::GetExtension(const ListValue* args) {
710 std::string extension_id = WideToASCII(ExtractStringValue(args)); 710 std::string extension_id = WideToASCII(ExtractStringValue(args));
711 CHECK(!extension_id.empty()); 711 CHECK(!extension_id.empty());
712 return extensions_service_->GetExtensionById(extension_id, false); 712 return extensions_service_->GetExtensionById(extension_id, true);
713 } 713 }
714 714
715 void ExtensionsDOMHandler::MaybeUpdateAfterNotification() { 715 void ExtensionsDOMHandler::MaybeUpdateAfterNotification() {
716 if (!ignore_notifications_ && dom_ui_->tab_contents()) 716 if (!ignore_notifications_ && dom_ui_->tab_contents())
717 HandleRequestExtensionsData(NULL); 717 HandleRequestExtensionsData(NULL);
718 deleting_rvh_ = NULL; 718 deleting_rvh_ = NULL;
719 } 719 }
720 720
721 static void CreateScriptFileDetailValue( 721 static void CreateScriptFileDetailValue(
722 const FilePath& extension_path, const UserScript::FileList& scripts, 722 const FilePath& extension_path, const UserScript::FileList& scripts,
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 // static 911 // static
912 RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() { 912 RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() {
913 return ResourceBundle::GetSharedInstance(). 913 return ResourceBundle::GetSharedInstance().
914 LoadDataResourceBytes(IDR_PLUGIN); 914 LoadDataResourceBytes(IDR_PLUGIN);
915 } 915 }
916 916
917 // static 917 // static
918 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) { 918 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) {
919 prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, false); 919 prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, false);
920 } 920 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698