diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 19:52:33 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 19:52:33 +0000 |
| commit | b658359fcbccccd57bb5448519ab3f9b1ff35531 (patch) | |
| tree | c72659685d2bdbe6151a7e2af704772bc0ee2b70 /chrome/browser/background | |
| parent | 5f5b937c2065a1028f5402474199043ce11f8858 (diff) | |
| download | chromium_src-b658359fcbccccd57bb5448519ab3f9b1ff35531.zip chromium_src-b658359fcbccccd57bb5448519ab3f9b1ff35531.tar.gz chromium_src-b658359fcbccccd57bb5448519ab3f9b1ff35531.tar.bz2 | |
Define the public interface for content browser SiteInstance. This interface is implemented by the SiteInstanceImpl class which lives
in content\browser\site_instance.cc/.h.
Changes as part of creating a content API.
BUG=98716
TEST=No change in functionality. Hopefully it all compiles and works.
Review URL: http://codereview.chromium.org/8515027
Review URL: https://chromiumcodereview.appspot.com/9146028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/background')
| -rw-r--r-- | chrome/browser/background/background_contents_service.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/background/background_contents_service.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc index f1308eb..b90d52c 100644 --- a/chrome/browser/background/background_contents_service.cc +++ b/chrome/browser/background/background_contents_service.cc @@ -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,12 +28,13 @@ #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" +using content::SiteInstance; using content::WebContents; namespace { @@ -448,7 +450,7 @@ void BackgroundContentsService::LoadBackgroundContents( DVLOG(1) << "Loading background content url: " << url; BackgroundContents* contents = CreateBackgroundContents( - SiteInstance::CreateSiteInstanceForURL(profile, url), + SiteInstance::CreateForURL(profile, url), MSG_ROUTING_NONE, profile, frame_name, diff --git a/chrome/browser/background/background_contents_service.h b/chrome/browser/background/background_contents_service.h index b45112c..457d0ab 100644 --- a/chrome/browser/background/background_contents_service.h +++ b/chrome/browser/background/background_contents_service.h @@ -74,7 +74,7 @@ class BackgroundContentsService : private content::NotificationObserver, // A BACKGROUND_CONTENTS_OPENED notification will be generated with the passed // |frame_name| and |application_id| values, using the passed |profile| as the // Source.. - BackgroundContents* CreateBackgroundContents(SiteInstance* site, + BackgroundContents* CreateBackgroundContents(content::SiteInstance* site, int route_id, Profile* profile, const string16& frame_name, |