| Index: chrome/browser/extensions/extension_host.cc
|
| diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
|
| index 1051399fd6aaf7b0d63133f7d0c5a5901df782a8..df34a973a5aa27ac5efbb1a2e11238fd99e5354e 100644
|
| --- a/chrome/browser/extensions/extension_host.cc
|
| +++ b/chrome/browser/extensions/extension_host.cc
|
| @@ -21,7 +21,7 @@
|
| #include "chrome/browser/dom_ui/dom_ui_factory.h"
|
| #include "chrome/browser/extensions/extension_message_service.h"
|
| #include "chrome/browser/extensions/extension_tabs_module.h"
|
| -#include "chrome/browser/extensions/extensions_service.h"
|
| +#include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/file_select_helper.h"
|
| #include "chrome/browser/platform_util.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| @@ -210,7 +210,7 @@ void ExtensionHost::CreateRenderViewNow() {
|
| NavigateToURL(url_);
|
| DCHECK(IsRenderViewLive());
|
| if (is_background_page())
|
| - profile_->GetExtensionsService()->DidCreateRenderViewForBackgroundPage(
|
| + profile_->GetExtensionService()->DidCreateRenderViewForBackgroundPage(
|
| this);
|
| }
|
|
|
| @@ -235,7 +235,7 @@ void ExtensionHost::NavigateToURL(const GURL& url) {
|
| url_ = url;
|
|
|
| if (!is_background_page() &&
|
| - !profile_->GetExtensionsService()->IsBackgroundPageReady(extension_)) {
|
| + !profile_->GetExtensionService()->IsBackgroundPageReady(extension_)) {
|
| // Make sure the background page loads before any others.
|
| registrar_.Add(this, NotificationType::EXTENSION_BACKGROUND_PAGE_READY,
|
| Source<Extension>(extension_));
|
| @@ -250,7 +250,7 @@ void ExtensionHost::Observe(NotificationType type,
|
| const NotificationDetails& details) {
|
| switch (type.value) {
|
| case NotificationType::EXTENSION_BACKGROUND_PAGE_READY:
|
| - DCHECK(profile_->GetExtensionsService()->
|
| + DCHECK(profile_->GetExtensionService()->
|
| IsBackgroundPageReady(extension_));
|
| NavigateToURL(url_);
|
| break;
|
| @@ -397,7 +397,7 @@ void ExtensionHost::DocumentAvailableInMainFrame(RenderViewHost* rvh) {
|
|
|
| document_element_available_ = true;
|
| if (is_background_page()) {
|
| - profile_->GetExtensionsService()->SetBackgroundPageReady(extension_);
|
| + profile_->GetExtensionService()->SetBackgroundPageReady(extension_);
|
| } else {
|
| switch (extension_host_type_) {
|
| case ViewType::EXTENSION_INFOBAR:
|
|
|