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

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

Issue 11307020: Cleanup: Simplify some extensions / content_settings Observer code by simply DCHECKING instead of u… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Flip DCHECK_EQ arguments to (expected, actual) Created 8 years, 1 month 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/extensions/extension_service.h" 5 #include "chrome/browser/extensions/extension_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 2564 matching lines...) Expand 10 before | Expand all | Expand 10 after
2575 2575
2576 process_map_.RemoveAllFromProcess(process->GetID()); 2576 process_map_.RemoveAllFromProcess(process->GetID());
2577 BrowserThread::PostTask( 2577 BrowserThread::PostTask(
2578 BrowserThread::IO, FROM_HERE, 2578 BrowserThread::IO, FROM_HERE,
2579 base::Bind(&ExtensionInfoMap::UnregisterAllExtensionsInProcess, 2579 base::Bind(&ExtensionInfoMap::UnregisterAllExtensionsInProcess,
2580 system_->info_map(), 2580 system_->info_map(),
2581 process->GetID())); 2581 process->GetID()));
2582 break; 2582 break;
2583 } 2583 }
2584 case chrome::NOTIFICATION_PREF_CHANGED: { 2584 case chrome::NOTIFICATION_PREF_CHANGED: {
2585 std::string* pref_name = content::Details<std::string>(details).ptr(); 2585 const std::string& pref_name =
2586 if (*pref_name == prefs::kExtensionInstallAllowList || 2586 *content::Details<std::string>(details).ptr();
2587 *pref_name == prefs::kExtensionInstallDenyList) { 2587 DCHECK(pref_name == prefs::kExtensionInstallAllowList ||
2588 IdentifyAlertableExtensions(); 2588 pref_name == prefs::kExtensionInstallDenyList)
2589 CheckManagementPolicy(); 2589 << "Unexpected preference name " << pref_name;
2590 } else { 2590 IdentifyAlertableExtensions();
2591 NOTREACHED() << "Unexpected preference name."; 2591 CheckManagementPolicy();
2592 }
2593 break; 2592 break;
2594 } 2593 }
2595 case chrome::NOTIFICATION_IMPORT_FINISHED: { 2594 case chrome::NOTIFICATION_IMPORT_FINISHED: {
2596 InitAfterImport(); 2595 InitAfterImport();
2597 break; 2596 break;
2598 } 2597 }
2599 2598
2600 default: 2599 default:
2601 NOTREACHED() << "Unexpected notification type."; 2600 NOTREACHED() << "Unexpected notification type.";
2602 } 2601 }
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
2825 // External extensions are initially disabled. We prompt the user before 2824 // External extensions are initially disabled. We prompt the user before
2826 // enabling them. 2825 // enabling them.
2827 if (Extension::IsExternalLocation(extension->location()) && 2826 if (Extension::IsExternalLocation(extension->location()) &&
2828 !extension_prefs_->IsExternalExtensionAcknowledged(extension->id())) { 2827 !extension_prefs_->IsExternalExtensionAcknowledged(extension->id())) {
2829 return false; 2828 return false;
2830 } 2829 }
2831 } 2830 }
2832 2831
2833 return true; 2832 return true;
2834 } 2833 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/extensions/external_policy_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698