window->OverrideWebkitPrefs(prefs);
}
-bool AtomBrowserClient::ShouldSwapBrowsingInstancesForNavigation(
- content::SiteInstance* site_instance,
- const GURL& current_url,
- const GURL& new_url) {
- if (site_instance->HasProcess())
- dying_render_process_ = site_instance->GetProcess();
-
- // Restart renderer process for all navigations, this relies on a patch to
- // Chromium: http://git.io/_PaNyg.
- return true;
-}
-
std::string AtomBrowserClient::GetApplicationLocale() {
return l10n_util::GetApplicationLocale("");
}
+void AtomBrowserClient::OverrideSiteInstanceForNavigation(
+ content::BrowserContext* browser_context,
+ content::SiteInstance* current_instance,
+ const GURL& url,
+ content::SiteInstance** new_instance) {
+ if (current_instance->HasProcess())
+ dying_render_process_ = current_instance->GetProcess();
+
+ // Restart renderer process for all navigations.
+ *new_instance = content::SiteInstance::CreateForURL(browser_context, url);
+}
+
void AtomBrowserClient::AppendExtraCommandLineSwitches(
base::CommandLine* command_line,
int child_process_id) {
void ResourceDispatcherHostCreated() override;
void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
content::WebPreferences* prefs) override;
- bool ShouldSwapBrowsingInstancesForNavigation(
- content::SiteInstance* site_instance,
- const GURL& current_url,
- const GURL& new_url) override;
std::string GetApplicationLocale() override;
+ void OverrideSiteInstanceForNavigation(
+ content::BrowserContext* browser_context,
+ content::SiteInstance* current_instance,
+ const GURL& dest_url,
+ content::SiteInstance** new_instance);
void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
int child_process_id) override;