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

Unified Diff: chrome/browser/ui/browser.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/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 5f4caab3ee49b0de1d02c82c3a2cf805f61d6044..44b0355556675941bfc94c1accc32203b01b3655 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -53,6 +53,7 @@
#include "chrome/browser/extensions/browser_extension_window_controller.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/file_select_helper.h"
@@ -1703,7 +1704,8 @@ void Browser::WebIntentDispatch(
if (web_contents &&
!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kWebIntentsInvocationEnabled)) {
- ExtensionService* extensions_service = profile_->GetExtensionService();
+ ExtensionService* extensions_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (!extensions_service ||
extensions_service->extensions()->GetExtensionOrAppByURL(
ExtensionURLInfo(web_contents->GetURL())) == NULL) {
@@ -2344,7 +2346,8 @@ bool Browser::MaybeCreateBackgroundContents(int route_id,
const string16& frame_name,
const GURL& target_url) {
GURL opener_url = opener_web_contents->GetURL();
- ExtensionService* extensions_service = profile_->GetExtensionService();
+ ExtensionService* extensions_service =
+ extensions::ExtensionSystem::Get(profile_)->extension_service();
if (!opener_url.is_valid() ||
frame_name.empty() ||
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698