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

Side by Side Diff: chrome/browser/chromeos/extensions/file_manager_util.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: replace missing extension_system include Created 8 years 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 (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
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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 mediaplayer->PopupMediaPlayer(); 762 mediaplayer->PopupMediaPlayer();
761 mediaplayer->ForcePlayMediaURL(url); 763 mediaplayer->ForcePlayMediaURL(url);
762 return true; 764 return true;
763 } 765 }
764 if (internal_task_id == kFileBrowserWatchTaskId) { 766 if (internal_task_id == kFileBrowserWatchTaskId) {
765 GURL url; 767 GURL url;
766 if (!ConvertFileToFileSystemUrl(profile, path, 768 if (!ConvertFileToFileSystemUrl(profile, path,
767 GetFileBrowserExtensionUrl().GetOrigin(), &url)) 769 GetFileBrowserExtensionUrl().GetOrigin(), &url))
768 return false; 770 return false;
769 771
770 ExtensionService* service = profile->GetExtensionService(); 772 ExtensionService* service =
773 extensions::ExtensionSystem::Get(profile)->extension_service();
771 if (!service) 774 if (!service)
772 return false; 775 return false;
773 776
774 const extensions::Extension* extension = 777 const extensions::Extension* extension =
775 service->GetExtensionById(kFileBrowserDomain, false); 778 service->GetExtensionById(kFileBrowserDomain, false);
776 if (!extension) 779 if (!extension)
777 return false; 780 return false;
778 781
779 application_launch::LaunchParams params(profile, extension, 782 application_launch::LaunchParams params(profile, extension,
780 extension_misc::LAUNCH_WINDOW, 783 extension_misc::LAUNCH_WINDOW,
(...skipping 24 matching lines...) Expand all
805 size_t extension_index = UMAExtensionIndex(file_extension.data(), 808 size_t extension_index = UMAExtensionIndex(file_extension.data(),
806 kUMATrackingExtensions, 809 kUMATrackingExtensions,
807 arraysize(kUMATrackingExtensions)); 810 arraysize(kUMATrackingExtensions));
808 UMA_HISTOGRAM_ENUMERATION("FileBrowser.OpeningFileType", 811 UMA_HISTOGRAM_ENUMERATION("FileBrowser.OpeningFileType",
809 extension_index, 812 extension_index,
810 arraysize(kUMATrackingExtensions) - 1); 813 arraysize(kUMATrackingExtensions) - 1);
811 return false; 814 return false;
812 } 815 }
813 816
814 void InstallCRX(Browser* browser, const FilePath& path) { 817 void InstallCRX(Browser* browser, const FilePath& path) {
815 ExtensionService* service = browser->profile()->GetExtensionService(); 818 ExtensionService* service =
819 extensions::ExtensionSystem::Get(browser->profile())->extension_service();
816 CHECK(service); 820 CHECK(service);
817 821
818 content::WebContents* web_contents = 822 content::WebContents* web_contents =
819 browser->tab_strip_model()->GetActiveWebContents(); 823 browser->tab_strip_model()->GetActiveWebContents();
820 scoped_refptr<extensions::CrxInstaller> installer( 824 scoped_refptr<extensions::CrxInstaller> installer(
821 extensions::CrxInstaller::Create( 825 extensions::CrxInstaller::Create(
822 service, 826 service,
823 new ExtensionInstallPrompt(web_contents))); 827 new ExtensionInstallPrompt(web_contents)));
824 installer->set_error_on_unsupported_requirements(true); 828 installer->set_error_on_unsupported_requirements(true);
825 installer->set_is_gallery_install(false); 829 installer->set_is_gallery_install(false);
(...skipping 28 matching lines...) Expand all
854 for (google_apis::OperationProgressStatusList::const_iterator iter = 858 for (google_apis::OperationProgressStatusList::const_iterator iter =
855 list.begin(); 859 list.begin();
856 iter != list.end(); ++iter) { 860 iter != list.end(); ++iter) {
857 result_list->Append( 861 result_list->Append(
858 ProgessStatusToDictionaryValue(profile, origin_url, *iter)); 862 ProgessStatusToDictionaryValue(profile, origin_url, *iter));
859 } 863 }
860 return result_list.release(); 864 return result_list.release();
861 } 865 }
862 866
863 } // namespace file_manager_util 867 } // namespace file_manager_util
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/file_handler_util.cc ('k') | chrome/browser/chromeos/extensions/input_method_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698