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

Side by Side Diff: chrome/browser/chromeos/file_manager/file_tasks.cc

Issue 1110833003: Move the IsSupported* mime functions out of //net and into //components/mime_util (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 7 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
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/download/download_target_determiner.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/file_manager/file_tasks.h" 5 #include "chrome/browser/chromeos/file_manager/file_tasks.h"
6 6
7 #include "apps/launcher.h" 7 #include "apps/launcher.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/prefs/scoped_user_pref_update.h" 10 #include "base/prefs/scoped_user_pref_update.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "chrome/browser/chromeos/drive/file_system_util.h" 12 #include "chrome/browser/chromeos/drive/file_system_util.h"
13 #include "chrome/browser/chromeos/drive/file_task_executor.h" 13 #include "chrome/browser/chromeos/drive/file_task_executor.h"
14 #include "chrome/browser/chromeos/file_manager/app_id.h" 14 #include "chrome/browser/chromeos/file_manager/app_id.h"
15 #include "chrome/browser/chromeos/file_manager/file_browser_handlers.h" 15 #include "chrome/browser/chromeos/file_manager/file_browser_handlers.h"
16 #include "chrome/browser/chromeos/file_manager/fileapi_util.h" 16 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
17 #include "chrome/browser/chromeos/file_manager/open_util.h" 17 #include "chrome/browser/chromeos/file_manager/open_util.h"
18 #include "chrome/browser/drive/drive_api_util.h" 18 #include "chrome/browser/drive/drive_api_util.h"
19 #include "chrome/browser/drive/drive_app_registry.h" 19 #include "chrome/browser/drive/drive_app_registry.h"
20 #include "chrome/browser/extensions/extension_tab_util.h" 20 #include "chrome/browser/extensions/extension_tab_util.h"
21 #include "chrome/browser/extensions/extension_util.h" 21 #include "chrome/browser/extensions/extension_util.h"
22 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/ui/extensions/application_launch.h" 23 #include "chrome/browser/ui/extensions/application_launch.h"
24 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 24 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
25 #include "chrome/common/extensions/api/file_browser_handlers/file_browser_handle r.h" 25 #include "chrome/common/extensions/api/file_browser_handlers/file_browser_handle r.h"
26 #include "chrome/common/extensions/api/file_manager_private.h" 26 #include "chrome/common/extensions/api/file_manager_private.h"
27 #include "chrome/common/extensions/extension_constants.h" 27 #include "chrome/common/extensions/extension_constants.h"
28 #include "chrome/common/pref_names.h" 28 #include "chrome/common/pref_names.h"
29 #include "chromeos/chromeos_switches.h" 29 #include "chromeos/chromeos_switches.h"
30 #include "components/mime_util/mime_util.h"
30 #include "extensions/browser/extension_host.h" 31 #include "extensions/browser/extension_host.h"
31 #include "extensions/browser/extension_registry.h" 32 #include "extensions/browser/extension_registry.h"
32 #include "extensions/browser/extension_system.h" 33 #include "extensions/browser/extension_system.h"
33 #include "extensions/browser/extension_util.h" 34 #include "extensions/browser/extension_util.h"
34 #include "extensions/common/constants.h" 35 #include "extensions/common/constants.h"
35 #include "extensions/common/extension_set.h" 36 #include "extensions/common/extension_set.h"
36 #include "storage/browser/fileapi/file_system_url.h" 37 #include "storage/browser/fileapi/file_system_url.h"
37 38
38 using extensions::Extension; 39 using extensions::Extension;
39 using extensions::app_file_handler_util::FindFileHandlersForFiles; 40 using extensions::app_file_handler_util::FindFileHandlersForFiles;
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 const PathAndMimeTypeSet& path_mime_set) { 367 const PathAndMimeTypeSet& path_mime_set) {
367 if (file_handler_info.extensions.count("*") > 0 || 368 if (file_handler_info.extensions.count("*") > 0 ||
368 file_handler_info.types.count("*") > 0 || 369 file_handler_info.types.count("*") > 0 ||
369 file_handler_info.types.count("*/*") > 0) 370 file_handler_info.types.count("*/*") > 0)
370 return false; 371 return false;
371 372
372 // If text/* file handler matches with unsupported text mime type, we don't 373 // If text/* file handler matches with unsupported text mime type, we don't
373 // regard it as good match. 374 // regard it as good match.
374 if (file_handler_info.types.count("text/*")) { 375 if (file_handler_info.types.count("text/*")) {
375 for (const auto& path_mime : path_mime_set) { 376 for (const auto& path_mime : path_mime_set) {
376 if (net::IsUnsupportedTextMimeType(path_mime.second)) 377 if (mime_util::IsUnsupportedTextMimeType(path_mime.second))
377 return false; 378 return false;
378 } 379 }
379 } 380 }
380 381
381 return true; 382 return true;
382 } 383 }
383 384
384 void FindFileHandlerTasks( 385 void FindFileHandlerTasks(
385 Profile* profile, 386 Profile* profile,
386 const PathAndMimeTypeSet& path_mime_set, 387 const PathAndMimeTypeSet& path_mime_set,
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 DCHECK(!task->is_default()); 563 DCHECK(!task->is_default());
563 if (IsFallbackFileHandler(task->task_descriptor())) { 564 if (IsFallbackFileHandler(task->task_descriptor())) {
564 task->set_is_default(true); 565 task->set_is_default(true);
565 return; 566 return;
566 } 567 }
567 } 568 }
568 } 569 }
569 570
570 } // namespace file_tasks 571 } // namespace file_tasks
571 } // namespace file_manager 572 } // namespace file_manager
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/download/download_target_determiner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698