chrome/browser/extensions/bundle_installer.cc - Issue 16295003: 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/browser/extensions/bundle_installer.cc

Issue 16295003: 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/browser/extensions/browser_permissions_policy_delegate_unittest.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/bundle_installer.cc

diff --git a/chrome/browser/extensions/bundle_installer.cc b/chrome/browser/extensions/bundle_installer.cc

index c5db01029f419eca56b4c4174a4a194918b0b1ab..db7057ae6e7cb1aff597c48409e7699a7ada903d 100644

--- a/chrome/browser/extensions/bundle_installer.cc

+++ b/chrome/browser/extensions/bundle_installer.cc

@@ -261,8 +261,8 @@ void BundleInstaller::ShowPrompt() {

scoped_refptr<PermissionSet> permissions;

for (size_t i = 0; i < dummy_extensions_.size(); ++i) {

permissions = PermissionSet::CreateUnion(

- permissions,

- PermissionsData::GetRequiredPermissions(dummy_extensions_[i]));

+ permissions.get(),

+ PermissionsData::GetRequiredPermissions(dummy_extensions_[i].get()));

}

if (g_auto_approve_for_test == PROCEED) {

@@ -280,7 +280,7 @@ void BundleInstaller::ShowPrompt() {

if (browser)

web_contents = browser->tab_strip_model()->GetActiveWebContents();

install_ui_.reset(new ExtensionInstallPrompt(web_contents));

- install_ui_->ConfirmBundleInstall(this, permissions);

+ install_ui_->ConfirmBundleInstall(this, permissions.get());

}