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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix UserScriptListenerTests.MultiProfile Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index 73fac1f4ba5492253ebabc20754e3c831a8a42a1..515015b566eef1b83570fdd360758e9b8c742c12 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -70,6 +70,7 @@
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/web_contents.h"
+#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_resource.h"
@@ -701,9 +702,8 @@ extensions::LaunchType ChromeLauncherController::GetLaunchType(
if (!extension)
return extensions::LAUNCH_TYPE_DEFAULT;
- return extensions::GetLaunchType(
- profile_->GetExtensionService()->extension_prefs(),
- extension);
+ return extensions::GetLaunchType(extensions::ExtensionPrefs::Get(profile_),
+ extension);
}
ash::ShelfID ChromeLauncherController::GetShelfIDForAppID(

Powered by Google App Engine
This is Rietveld 408576698