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

Unified Diff: chrome/browser/ui/intents/web_intent_picker_controller.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/ui/intents/web_intent_picker_controller.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc
index c1e36679aa529107721bd88780226296e82c65db..707921eabb8ababf8f645ec36d69c314f13f5ff5 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc
@@ -14,6 +14,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/platform_app_launcher.h"
#include "chrome/browser/extensions/webstore_installer.h"
#include "chrome/browser/intents/cws_intents_registry_factory.h"
@@ -276,7 +277,8 @@ void WebIntentPickerController::OnServiceChosen(
DefaultsUsage suppress_defaults) {
web_intents::RecordServiceInvoke(uma_bucket_);
uma_reporter_->ResetServiceActiveTimer();
- ExtensionService* extension_service = profile_->GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
DCHECK(extension_service);
#if defined(TOOLKIT_VIEWS)
@@ -652,7 +654,7 @@ void WebIntentPickerController::RegistryCallsCompleted() {
void WebIntentPickerController::OnCWSIntentServicesAvailable(
const CWSIntentsRegistry::IntentExtensionList& extensions) {
ExtensionServiceInterface* extension_service =
- profile_->GetExtensionService();
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
std::vector<WebIntentPickerModel::SuggestedExtension> suggestions;
for (size_t i = 0; i < extensions.size(); ++i) {
« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc ('k') | chrome/browser/ui/startup/startup_browser_creator_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698