chrome/browser/extensions/extension_reenabler.cc - Issue 842523002: base: Change DCHECK_IS_ON to a macro DCHECK_IS_ON().

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_reenabler.cc

Issue 842523002: base: Change DCHECK_IS_ON to a macro DCHECK_IS_ON(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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

« android_webview/browser/hardware_renderer.cc ('K') | « chrome/browser/extensions/activity_log/hashed_ad_network_database.cc ('k') | chrome/browser/history/top_sites_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_reenabler.cc

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

index 4fb6cff69315d346f9bbbaf15153968f07ad4c5d..c1f8d0b1faf6e7cc7285d0fbcc83952e544280e4 100644

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

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

@@ -29,7 +29,7 @@ scoped_ptr<ExtensionReenabler> ExtensionReenabler::PromptForReenable(

content::WebContents* web_contents,

const GURL& referrer_url,

const Callback& callback) {

-#if DCHECK_IS_ON

+#if !DCHECK_IS_OFF

// We should only try to reenable an extension that is, in fact, disabled.

DCHECK(ExtensionRegistry::Get(browser_context)->disabled_extensions().

Contains(extension->id()));

@@ -38,7 +38,7 @@ scoped_ptr<ExtensionReenabler> ExtensionReenabler::PromptForReenable(

int disable_reasons =

ExtensionPrefs::Get(browser_context)->GetDisableReasons(extension->id());

DCHECK_NE(0, disable_reasons & Extension::DISABLE_PERMISSIONS_INCREASE);

-#endif // DCHECK_IS_ON

+#endif // !DCHECK_IS_OFF

return make_scoped_ptr(new ExtensionReenabler(

extension,