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

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

Issue 401523002: Move media related mimetype functionality out of net/ and into media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and add content/common/mime_util.h for realz 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 unified diff | Download patch | Annotate | Revision Log
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 "content/common/mime_util.h"
19 #include "content/public/browser/browser_context.h" 20 #include "content/public/browser/browser_context.h"
20 #include "content/public/browser/browser_thread.h" 21 #include "content/public/browser/browser_thread.h"
21 #include "content/public/browser/download_interrupt_reasons.h" 22 #include "content/public/browser/download_interrupt_reasons.h"
22 #include "extensions/common/constants.h" 23 #include "extensions/common/constants.h"
23 #include "grit/generated_resources.h" 24 #include "grit/generated_resources.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 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 469 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
470 DCHECK(!virtual_path_.empty()); 470 DCHECK(!virtual_path_.empty());
471 DCHECK(!local_path_.empty()); 471 DCHECK(!local_path_.empty());
472 DCHECK(!is_filetype_handled_safely_); 472 DCHECK(!is_filetype_handled_safely_);
473 473
474 next_state_ = STATE_DETERMINE_IF_ADOBE_READER_UP_TO_DATE; 474 next_state_ = STATE_DETERMINE_IF_ADOBE_READER_UP_TO_DATE;
475 475
476 if (mime_type_.empty()) 476 if (mime_type_.empty())
477 return CONTINUE; 477 return CONTINUE;
478 478
479 if (net::IsSupportedMimeType(mime_type_)) { 479 if (content::IsSupportedMimeType(mime_type_)) {
480 is_filetype_handled_safely_ = true; 480 is_filetype_handled_safely_ = true;
481 return CONTINUE; 481 return CONTINUE;
482 } 482 }
483 483
484 #if defined(ENABLE_PLUGINS) 484 #if defined(ENABLE_PLUGINS)
485 BrowserThread::PostTask( 485 BrowserThread::PostTask(
486 BrowserThread::IO, 486 BrowserThread::IO,
487 FROM_HERE, 487 FROM_HERE,
488 base::Bind( 488 base::Bind(
489 &IsHandledBySafePlugin, 489 &IsHandledBySafePlugin,
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 const base::FilePath& suggested_path) { 877 const base::FilePath& suggested_path) {
878 return base::FilePath(suggested_path.value() + kCrdownloadSuffix); 878 return base::FilePath(suggested_path.value() + kCrdownloadSuffix);
879 } 879 }
880 880
881 #if defined(OS_WIN) 881 #if defined(OS_WIN)
882 // static 882 // static
883 bool DownloadTargetDeterminer::IsAdobeReaderUpToDate() { 883 bool DownloadTargetDeterminer::IsAdobeReaderUpToDate() {
884 return g_is_adobe_reader_up_to_date_; 884 return g_is_adobe_reader_up_to_date_;
885 } 885 }
886 #endif 886 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698