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

Unified 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, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/file_manager_util.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
index 381966f3931d67e75ab4a48e17cc0372e765ba45..006380129d0316547ac8187d10d66f4583c8e87b 100644
--- a/chrome/browser/chromeos/extensions/file_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager_util.cc
@@ -25,6 +25,7 @@
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/plugins/plugin_prefs.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -515,7 +516,8 @@ void OpenFileBrowser(const FilePath& path,
url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(), false);
}
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (!service)
return;
@@ -767,7 +769,8 @@ bool ExecuteBuiltinHandler(Browser* browser, const FilePath& path,
GetFileBrowserExtensionUrl().GetOrigin(), &url))
return false;
- ExtensionService* service = profile->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(profile)->extension_service();
if (!service)
return false;
@@ -812,7 +815,8 @@ bool ExecuteBuiltinHandler(Browser* browser, const FilePath& path,
}
void InstallCRX(Browser* browser, const FilePath& path) {
- ExtensionService* service = browser->profile()->GetExtensionService();
+ ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser->profile())->extension_service();
CHECK(service);
content::WebContents* web_contents =
« 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