chrome/browser/extensions/extension_service.cc - Issue 368133005: Fixes for re-enabling more MSVC level 4 warnings: chrome/browser/ edition

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/extension_service.cc

Issue 368133005: Fixes for re-enabling more MSVC level 4 warnings: chrome/browser/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Review comment Created 6 years, 5 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/api/web_request/web_request_api_helpers.cc ('k') | chrome/browser/extensions/extension_toolbar_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_service.cc

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

index 3595b6adcaeae426710f50a2930605b523f1f9fc..b8e8b4c08c31ea3020db69b7b412e4ddbead61a0 100644

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

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

@@ -1589,8 +1589,9 @@ void ExtensionService::OnExtensionInstalled(

const std::string& id = extension->id();

bool initial_enable = ShouldEnableOnInstall(extension);

std::string install_parameter;

- const extensions::PendingExtensionInfo* pending_extension_info = NULL;

- if ((pending_extension_info = pending_extension_manager()->GetById(id))) {

+ const extensions::PendingExtensionInfo* pending_extension_info =

+ pending_extension_manager()->GetById(id);

+ if (pending_extension_info) {

if (!pending_extension_info->ShouldAllowInstall(extension)) {

pending_extension_manager()->Remove(id);