OLD | NEW |
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 #include "chrome/browser/chromeos/extensions/file_manager_util.h" | 4 #include "chrome/browser/chromeos/extensions/file_manager_util.h" |
5 | 5 |
6 #include "ash/shell.h" | 6 #include "ash/shell.h" |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
11 #include "base/json/json_writer.h" | 11 #include "base/json/json_writer.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
16 #include "base/utf_string_conversions.h" | 16 #include "base/utf_string_conversions.h" |
17 #include "base/values.h" | 17 #include "base/values.h" |
18 #include "chrome/browser/chromeos/drive/drive.pb.h" | 18 #include "chrome/browser/chromeos/drive/drive.pb.h" |
19 #include "chrome/browser/chromeos/drive/drive_file_system.h" | 19 #include "chrome/browser/chromeos/drive/drive_file_system.h" |
20 #include "chrome/browser/chromeos/drive/drive_file_system_util.h" | 20 #include "chrome/browser/chromeos/drive/drive_file_system_util.h" |
21 #include "chrome/browser/chromeos/drive/drive_files.h" | 21 #include "chrome/browser/chromeos/drive/drive_files.h" |
22 #include "chrome/browser/chromeos/drive/drive_system_service.h" | 22 #include "chrome/browser/chromeos/drive/drive_system_service.h" |
23 #include "chrome/browser/chromeos/extensions/file_handler_util.h" | 23 #include "chrome/browser/chromeos/extensions/file_handler_util.h" |
24 #include "chrome/browser/chromeos/media/media_player.h" | 24 #include "chrome/browser/chromeos/media/media_player.h" |
25 #include "chrome/browser/extensions/crx_installer.h" | 25 #include "chrome/browser/extensions/crx_installer.h" |
26 #include "chrome/browser/extensions/extension_install_prompt.h" | 26 #include "chrome/browser/extensions/extension_install_prompt.h" |
27 #include "chrome/browser/extensions/extension_service.h" | 27 #include "chrome/browser/extensions/extension_service.h" |
| 28 #include "chrome/browser/extensions/extension_system.h" |
28 #include "chrome/browser/plugins/plugin_prefs.h" | 29 #include "chrome/browser/plugins/plugin_prefs.h" |
29 #include "chrome/browser/profiles/profile.h" | 30 #include "chrome/browser/profiles/profile.h" |
30 #include "chrome/browser/profiles/profile_manager.h" | 31 #include "chrome/browser/profiles/profile_manager.h" |
31 #include "chrome/browser/ui/browser.h" | 32 #include "chrome/browser/ui/browser.h" |
32 #include "chrome/browser/ui/browser_finder.h" | 33 #include "chrome/browser/ui/browser_finder.h" |
33 #include "chrome/browser/ui/browser_list.h" | 34 #include "chrome/browser/ui/browser_list.h" |
34 #include "chrome/browser/ui/browser_tabstrip.h" | 35 #include "chrome/browser/ui/browser_tabstrip.h" |
35 #include "chrome/browser/ui/browser_window.h" | 36 #include "chrome/browser/ui/browser_window.h" |
36 #include "chrome/browser/ui/extensions/application_launch.h" | 37 #include "chrome/browser/ui/extensions/application_launch.h" |
37 #include "chrome/browser/ui/host_desktop.h" | 38 #include "chrome/browser/ui/host_desktop.h" |
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
508 base::JSONWriter::Write(&arg_value, &query); | 509 base::JSONWriter::Write(&arg_value, &query); |
509 url += "?" + net::EscapeUrlEncodedData(query, false); | 510 url += "?" + net::EscapeUrlEncodedData(query, false); |
510 } | 511 } |
511 if (!path.empty()) { | 512 if (!path.empty()) { |
512 FilePath virtual_path; | 513 FilePath virtual_path; |
513 if (!ConvertFileToRelativeFileSystemPath(profile, path, &virtual_path)) | 514 if (!ConvertFileToRelativeFileSystemPath(profile, path, &virtual_path)) |
514 return; | 515 return; |
515 url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(), false); | 516 url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(), false); |
516 } | 517 } |
517 | 518 |
518 ExtensionService* service = profile->GetExtensionService(); | 519 ExtensionService* service = |
| 520 extensions::ExtensionSystem::Get(profile)->extension_service(); |
519 if (!service) | 521 if (!service) |
520 return; | 522 return; |
521 | 523 |
522 const extensions::Extension* extension = | 524 const extensions::Extension* extension = |
523 service->GetExtensionById(kFileBrowserDomain, false); | 525 service->GetExtensionById(kFileBrowserDomain, false); |
524 if (!extension) | 526 if (!extension) |
525 return; | 527 return; |
526 | 528 |
527 application_launch::LaunchParams params(profile, extension, | 529 application_launch::LaunchParams params(profile, extension, |
528 extension_misc::LAUNCH_WINDOW, | 530 extension_misc::LAUNCH_WINDOW, |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
759 mediaplayer->PopupMediaPlayer(); | 761 mediaplayer->PopupMediaPlayer(); |
760 mediaplayer->ForcePlayMediaURL(url); | 762 mediaplayer->ForcePlayMediaURL(url); |
761 return true; | 763 return true; |
762 } | 764 } |
763 if (internal_task_id == kFileBrowserWatchTaskId) { | 765 if (internal_task_id == kFileBrowserWatchTaskId) { |
764 GURL url; | 766 GURL url; |
765 if (!ConvertFileToFileSystemUrl(profile, path, | 767 if (!ConvertFileToFileSystemUrl(profile, path, |
766 GetFileBrowserExtensionUrl().GetOrigin(), &url)) | 768 GetFileBrowserExtensionUrl().GetOrigin(), &url)) |
767 return false; | 769 return false; |
768 | 770 |
769 ExtensionService* service = profile->GetExtensionService(); | 771 ExtensionService* service = |
| 772 extensions::ExtensionSystem::Get(profile)->extension_service(); |
770 if (!service) | 773 if (!service) |
771 return false; | 774 return false; |
772 | 775 |
773 const extensions::Extension* extension = | 776 const extensions::Extension* extension = |
774 service->GetExtensionById(kFileBrowserDomain, false); | 777 service->GetExtensionById(kFileBrowserDomain, false); |
775 if (!extension) | 778 if (!extension) |
776 return false; | 779 return false; |
777 | 780 |
778 application_launch::LaunchParams params(profile, extension, | 781 application_launch::LaunchParams params(profile, extension, |
779 extension_misc::LAUNCH_WINDOW, | 782 extension_misc::LAUNCH_WINDOW, |
(...skipping 24 matching lines...) Expand all Loading... |
804 size_t extension_index = UMAExtensionIndex(file_extension.data(), | 807 size_t extension_index = UMAExtensionIndex(file_extension.data(), |
805 kUMATrackingExtensions, | 808 kUMATrackingExtensions, |
806 arraysize(kUMATrackingExtensions)); | 809 arraysize(kUMATrackingExtensions)); |
807 UMA_HISTOGRAM_ENUMERATION("FileBrowser.OpeningFileType", | 810 UMA_HISTOGRAM_ENUMERATION("FileBrowser.OpeningFileType", |
808 extension_index, | 811 extension_index, |
809 arraysize(kUMATrackingExtensions) - 1); | 812 arraysize(kUMATrackingExtensions) - 1); |
810 return false; | 813 return false; |
811 } | 814 } |
812 | 815 |
813 void InstallCRX(Browser* browser, const FilePath& path) { | 816 void InstallCRX(Browser* browser, const FilePath& path) { |
814 ExtensionService* service = browser->profile()->GetExtensionService(); | 817 ExtensionService* service = |
| 818 extensions::ExtensionSystem::Get(browser->profile())->extension_service(); |
815 CHECK(service); | 819 CHECK(service); |
816 | 820 |
817 content::WebContents* web_contents = | 821 content::WebContents* web_contents = |
818 browser->tab_strip_model()->GetActiveWebContents(); | 822 browser->tab_strip_model()->GetActiveWebContents(); |
819 scoped_refptr<extensions::CrxInstaller> installer( | 823 scoped_refptr<extensions::CrxInstaller> installer( |
820 extensions::CrxInstaller::Create( | 824 extensions::CrxInstaller::Create( |
821 service, | 825 service, |
822 new ExtensionInstallPrompt(web_contents))); | 826 new ExtensionInstallPrompt(web_contents))); |
823 installer->set_error_on_unsupported_requirements(true); | 827 installer->set_error_on_unsupported_requirements(true); |
824 installer->set_is_gallery_install(false); | 828 installer->set_is_gallery_install(false); |
(...skipping 28 matching lines...) Expand all Loading... |
853 for (google_apis::OperationProgressStatusList::const_iterator iter = | 857 for (google_apis::OperationProgressStatusList::const_iterator iter = |
854 list.begin(); | 858 list.begin(); |
855 iter != list.end(); ++iter) { | 859 iter != list.end(); ++iter) { |
856 result_list->Append( | 860 result_list->Append( |
857 ProgessStatusToDictionaryValue(profile, origin_url, *iter)); | 861 ProgessStatusToDictionaryValue(profile, origin_url, *iter)); |
858 } | 862 } |
859 return result_list.release(); | 863 return result_list.release(); |
860 } | 864 } |
861 | 865 |
862 } // namespace file_manager_util | 866 } // namespace file_manager_util |
OLD | NEW |