Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(405)

Side by Side Diff: chrome/browser/download/download_target_determiner.cc

Issue 877323009: Extracted media mime type checks from net/base/ into media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fixes #1 Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/download/download_target_determiner.h" 5 #include "chrome/browser/download/download_target_determiner.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/rand_util.h" 8 #include "base/rand_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
11 #include "chrome/browser/download/chrome_download_manager_delegate.h" 11 #include "chrome/browser/download/chrome_download_manager_delegate.h"
12 #include "chrome/browser/download/download_crx_util.h" 12 #include "chrome/browser/download/download_crx_util.h"
13 #include "chrome/browser/download/download_extensions.h" 13 #include "chrome/browser/download/download_extensions.h"
14 #include "chrome/browser/download/download_prefs.h" 14 #include "chrome/browser/download/download_prefs.h"
15 #include "chrome/browser/history/history_service.h" 15 #include "chrome/browser/history/history_service.h"
16 #include "chrome/browser/history/history_service_factory.h" 16 #include "chrome/browser/history/history_service_factory.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "chrome/grit/generated_resources.h" 19 #include "chrome/grit/generated_resources.h"
20 #include "content/common/mime_util.h"
20 #include "content/public/browser/browser_context.h" 21 #include "content/public/browser/browser_context.h"
21 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
22 #include "content/public/browser/download_interrupt_reasons.h" 23 #include "content/public/browser/download_interrupt_reasons.h"
23 #include "extensions/common/constants.h" 24 #include "extensions/common/constants.h"
24 #include "net/base/filename_util.h" 25 #include "net/base/filename_util.h"
25 #include "net/base/mime_util.h"
26 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
27 27
28 #if defined(ENABLE_EXTENSIONS) 28 #if defined(ENABLE_EXTENSIONS)
29 #include "chrome/browser/extensions/webstore_installer.h" 29 #include "chrome/browser/extensions/webstore_installer.h"
30 #include "extensions/common/feature_switch.h" 30 #include "extensions/common/feature_switch.h"
31 #endif 31 #endif
32 32
33 #if defined(ENABLE_PLUGINS) 33 #if defined(ENABLE_PLUGINS)
34 #include "chrome/browser/plugins/plugin_prefs.h" 34 #include "chrome/browser/plugins/plugin_prefs.h"
35 #include "content/public/browser/plugin_service.h" 35 #include "content/public/browser/plugin_service.h"
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 470 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
471 DCHECK(!virtual_path_.empty()); 471 DCHECK(!virtual_path_.empty());
472 DCHECK(!local_path_.empty()); 472 DCHECK(!local_path_.empty());
473 DCHECK(!is_filetype_handled_safely_); 473 DCHECK(!is_filetype_handled_safely_);
474 474
475 next_state_ = STATE_DETERMINE_IF_ADOBE_READER_UP_TO_DATE; 475 next_state_ = STATE_DETERMINE_IF_ADOBE_READER_UP_TO_DATE;
476 476
477 if (mime_type_.empty()) 477 if (mime_type_.empty())
478 return CONTINUE; 478 return CONTINUE;
479 479
480 if (net::IsSupportedMimeType(mime_type_)) { 480 if (content::IsSupportedMimeType(mime_type_)) {
481 is_filetype_handled_safely_ = true; 481 is_filetype_handled_safely_ = true;
482 return CONTINUE; 482 return CONTINUE;
483 } 483 }
484 484
485 #if defined(ENABLE_PLUGINS) 485 #if defined(ENABLE_PLUGINS)
486 BrowserThread::PostTask( 486 BrowserThread::PostTask(
487 BrowserThread::IO, 487 BrowserThread::IO,
488 FROM_HERE, 488 FROM_HERE,
489 base::Bind( 489 base::Bind(
490 &IsHandledBySafePlugin, 490 &IsHandledBySafePlugin,
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 const base::FilePath& suggested_path) { 886 const base::FilePath& suggested_path) {
887 return base::FilePath(suggested_path.value() + kCrdownloadSuffix); 887 return base::FilePath(suggested_path.value() + kCrdownloadSuffix);
888 } 888 }
889 889
890 #if defined(OS_WIN) 890 #if defined(OS_WIN)
891 // static 891 // static
892 bool DownloadTargetDeterminer::IsAdobeReaderUpToDate() { 892 bool DownloadTargetDeterminer::IsAdobeReaderUpToDate() {
893 return g_is_adobe_reader_up_to_date_; 893 return g_is_adobe_reader_up_to_date_;
894 } 894 }
895 #endif 895 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698