chrome/renderer/extensions/dispatcher.cc - Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/renderer/extensions/dispatcher.cc

Issue 15836003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 7 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 | « chrome/renderer/extensions/chrome_v8_context.cc ('k') | chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/extensions/dispatcher.cc

diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc

index 13778fed54eabf40db4538b7dfb2bb6ac07dcafe..7d0d01f45a42d25371c0d521fcbfb5414430e795 100644

--- a/chrome/renderer/extensions/dispatcher.cc

+++ b/chrome/renderer/extensions/dispatcher.cc

@@ -617,7 +617,7 @@ void Dispatcher::OnLoaded(

for (i = loaded_extensions.begin(); i != loaded_extensions.end(); ++i) {

std::string error;

scoped_refptr<const Extension> extension = i->ConvertToExtension(&error);

- if (!extension) {

+ if (!extension.get()) {

extension_load_errors_[i->id] = error;

continue;

}

@@ -1272,10 +1272,11 @@ void Dispatcher::OnUpdatePermissions(int reason_id,

const PermissionSet* new_active = NULL;

switch (reason) {

case UpdatedExtensionPermissionsInfo::ADDED:

- new_active = PermissionSet::CreateUnion(old_active, delta);

+ new_active = PermissionSet::CreateUnion(old_active.get(), delta.get());

break;

case UpdatedExtensionPermissionsInfo::REMOVED:

- new_active = PermissionSet::CreateDifference(old_active, delta);

+ new_active =

+ PermissionSet::CreateDifference(old_active.get(), delta.get());

break;

}