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

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

Issue 508513002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Two more Created 6 years, 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_error_controller.h" 5 #include "chrome/browser/extensions/extension_error_controller.h"
6 6
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/extensions/pending_extension_manager.h" 8 #include "chrome/browser/extensions/pending_extension_manager.h"
9 #include "extensions/browser/extension_prefs.h" 9 #include "extensions/browser/extension_prefs.h"
10 #include "extensions/browser/extension_registry.h" 10 #include "extensions/browser/extension_registry.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 ExtensionSystem* system = ExtensionSystem::Get(browser_context_); 113 ExtensionSystem* system = ExtensionSystem::Get(browser_context_);
114 ManagementPolicy* management_policy = system->management_policy(); 114 ManagementPolicy* management_policy = system->management_policy();
115 PendingExtensionManager* pending_extension_manager = 115 PendingExtensionManager* pending_extension_manager =
116 system->extension_service()->pending_extension_manager(); 116 system->extension_service()->pending_extension_manager();
117 const ExtensionSet& enabled_set = registry->enabled_extensions(); 117 const ExtensionSet& enabled_set = registry->enabled_extensions();
118 118
119 for (ExtensionSet::const_iterator iter = enabled_set.begin(); 119 for (ExtensionSet::const_iterator iter = enabled_set.begin();
120 iter != enabled_set.end(); 120 iter != enabled_set.end();
121 ++iter) { 121 ++iter) {
122 const Extension* extension = *iter; 122 const Extension* extension = iter->get();
123 123
124 // Skip for extensions that have pending updates. They will be checked again 124 // Skip for extensions that have pending updates. They will be checked again
125 // once the pending update is finished. 125 // once the pending update is finished.
126 if (pending_extension_manager->IsIdPending(extension->id())) 126 if (pending_extension_manager->IsIdPending(extension->id()))
127 continue; 127 continue;
128 128
129 // Extensions disabled by policy. Note: this no longer includes blacklisted 129 // Extensions disabled by policy. Note: this no longer includes blacklisted
130 // extensions, though we still show the same UI. 130 // extensions, though we still show the same UI.
131 if (!management_policy->UserMayLoad(extension, NULL /* ignore error */)) { 131 if (!management_policy->UserMayLoad(extension, NULL /* ignore error */)) {
132 if (!prefs->IsBlacklistedExtensionAcknowledged(extension->id())) 132 if (!prefs->IsBlacklistedExtensionAcknowledged(extension->id()))
133 blacklisted_extensions_.Insert(extension); 133 blacklisted_extensions_.Insert(extension);
134 } 134 }
135 } 135 }
136 } 136 }
137 137
138 } // namespace extensions 138 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698