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

Unified Diff: extensions/shell/browser/shell_extension_system.cc

Issue 503873002: Remove implicit conversions from scoped_refptr to T* in extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/renderer/api/serial/serial_api_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/browser/shell_extension_system.cc
diff --git a/extensions/shell/browser/shell_extension_system.cc b/extensions/shell/browser/shell_extension_system.cc
index 47db358ba0c3091bcdf326224a2f96dc8998b233..f038807cf4a59274d0eb39a8d20fcbcb53840a44 100644
--- a/extensions/shell/browser/shell_extension_system.cc
+++ b/extensions/shell/browser/shell_extension_system.cc
@@ -47,7 +47,7 @@ bool ShellExtensionSystem::LoadApp(const base::FilePath& app_dir) {
std::string load_error;
extension_ = file_util::LoadExtension(
app_dir, Manifest::COMMAND_LINE, load_flags, &load_error);
- if (!extension_) {
+ if (!extension_.get()) {
LOG(ERROR) << "Loading extension at " << app_dir.value()
<< " failed with: " << load_error;
return false;
@@ -63,12 +63,12 @@ bool ShellExtensionSystem::LoadApp(const base::FilePath& app_dir) {
ExtensionRegistry::Get(browser_context_)->AddEnabled(extension_);
- RegisterExtensionWithRequestContexts(extension_);
+ RegisterExtensionWithRequestContexts(extension_.get());
content::NotificationService::current()->Notify(
extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
content::Source<BrowserContext>(browser_context_),
- content::Details<const Extension>(extension_));
+ content::Details<const Extension>(extension_.get()));
// Inform the rest of the extensions system to start.
ready_.Signal();
@@ -131,7 +131,7 @@ StateStore* ShellExtensionSystem::rules_store() {
InfoMap* ShellExtensionSystem::info_map() {
if (!info_map_.get())
info_map_ = new InfoMap;
- return info_map_;
+ return info_map_.get();
}
LazyBackgroundTaskQueue* ShellExtensionSystem::lazy_background_task_queue() {
« no previous file with comments | « extensions/renderer/api/serial/serial_api_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698