| Index: content/shell/shell_content_browser_client.h
|
| diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
|
| index c4449520d350f2914a28f53248e41e5467f811a0..a9093a5ea532f0260b6e6c96ff239746cfff9278 100644
|
| --- a/content/shell/shell_content_browser_client.h
|
| +++ b/content/shell/shell_content_browser_client.h
|
| @@ -108,8 +108,9 @@ class ShellContentBrowserClient : public ContentBrowserClient
|
| int render_view_id) OVERRIDE;
|
| virtual WebKit::WebNotificationPresenter::Permission
|
| CheckDesktopNotificationPermission(
|
| - const GURL& source_url,
|
| - const content::ResourceContext& context) OVERRIDE;
|
| + const GURL& origin,
|
| + const content::ResourceContext& context,
|
| + int render_process_id) OVERRIDE;
|
| virtual void ShowDesktopNotification(
|
| const DesktopNotificationHostMsg_Show_Params& params,
|
| int render_process_id,
|
| @@ -120,9 +121,10 @@ class ShellContentBrowserClient : public ContentBrowserClient
|
| int render_view_id,
|
| int notification_id) OVERRIDE;
|
| virtual bool CanCreateWindow(
|
| - const GURL& source_url,
|
| + const GURL& origin,
|
| WindowContainerType container_type,
|
| - const content::ResourceContext& context) OVERRIDE;
|
| + const content::ResourceContext& context,
|
| + int render_process_id) OVERRIDE;
|
| virtual std::string GetWorkerProcessTitle(
|
| const GURL& url, const content::ResourceContext& context) OVERRIDE;
|
| virtual ResourceDispatcherHost* GetResourceDispatcherHost() OVERRIDE;
|
|
|