chrome/browser/download/download_target_determiner.cc - Issue 19547009: Move ".crx"/".pem" constants and extension_filenames constants into extensions/common/constants.cc.

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/download/download_target_determiner.cc

Issue 19547009: Move ".crx"/".pem" constants and extension_filenames constants into extensions/common/constants.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/download/chrome_download_manager_delegate.cc ('k') | chrome/browser/extensions/extension_protocols.cc » ('j') | chrome/browser/extensions/sandboxed_unpacker.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/download/download_target_determiner.cc

diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc

index 794886f260a0ac1306fce14038c75850f7224f00..02429b4ea4441c5f89ac9790069f0d1a529120f2 100644

--- a/chrome/browser/download/download_target_determiner.cc

+++ b/chrome/browser/download/download_target_determiner.cc

@@ -17,12 +17,12 @@

#include "chrome/browser/history/history_service.h"

#include "chrome/browser/history/history_service_factory.h"

#include "chrome/browser/profiles/profile.h"

-#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/feature_switch.h"

#include "chrome/common/pref_names.h"

#include "content/public/browser/browser_context.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/download_interrupt_reasons.h"

+#include "extensions/common/constants.h"

#include "grit/generated_resources.h"

#include "net/base/net_util.h"

#include "ui/base/l10n/l10n_util.h"

@@ -551,7 +551,7 @@ bool DownloadTargetDeterminer::ShouldPromptForDownload(

// don't bother asking where to keep it.

if (download_prefs_->PromptForDownload() &&

!download_crx_util::IsExtensionDownload(*download_) &&

- !extensions::Extension::IsExtension(filename) &&

+ !filename.MatchesExtension(extensions::kExtensionFileExtension) &&

!download_prefs_->IsAutoOpenEnabledBasedOnExtension(filename))

return true;