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

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional cleanup 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/startup/startup_browser_creator_impl.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 926f8e42daa11eb86b07bcd42d40368cb52366b2..06a0518fdf2c99a4c431a10d4c31019b673259fa 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -87,6 +87,7 @@
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
+#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/constants.h"
#include "grit/locale_settings.h"
@@ -204,12 +205,12 @@ bool GetAppLaunchContainer(
// Look at preferences to find the right launch container. If no
// preference is set, launch as a window.
extensions::LaunchContainer launch_container = extensions::GetLaunchContainer(
- extensions_service->extension_prefs(), extension);
+ extensions::ExtensionPrefs::Get(profile), extension);
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableStreamlinedHostedApps) &&
!extensions::HasPreferredLaunchContainer(
- extensions_service->extension_prefs(), extension)) {
+ extensions::ExtensionPrefs::Get(profile), extension)) {
launch_container = extensions::LAUNCH_CONTAINER_WINDOW;
}

Powered by Google App Engine
This is Rietveld 408576698