| Index: chrome/browser/background/background_contents_service.cc
|
| ===================================================================
|
| --- chrome/browser/background/background_contents_service.cc (revision 118703)
|
| +++ chrome/browser/background/background_contents_service.cc (working copy)
|
| @@ -7,6 +7,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| +#include "base/message_loop.h"
|
| #include "base/string_util.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "base/values.h"
|
| @@ -27,8 +28,8 @@
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "chrome/common/pref_names.h"
|
| -#include "content/browser/site_instance.h"
|
| #include "content/public/browser/notification_service.h"
|
| +#include "content/public/browser/site_instance.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "grit/generated_resources.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -448,7 +449,7 @@
|
| DVLOG(1) << "Loading background content url: " << url;
|
|
|
| BackgroundContents* contents = CreateBackgroundContents(
|
| - SiteInstance::CreateSiteInstanceForURL(profile, url),
|
| + content::SiteInstance::CreateSiteInstanceForURL(profile, url),
|
| MSG_ROUTING_NONE,
|
| profile,
|
| frame_name,
|
| @@ -461,7 +462,7 @@
|
| }
|
|
|
| BackgroundContents* BackgroundContentsService::CreateBackgroundContents(
|
| - SiteInstance* site,
|
| + content::SiteInstance* site,
|
| int routing_id,
|
| Profile* profile,
|
| const string16& frame_name,
|
|
|