summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 23:49:02 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 23:49:02 +0000
commit34eec7ffe3c9c05f58069ea4afce7e2d89843ac9 (patch)
tree36ee8914ed9d7b8ee47ba813a1ac67a0caf8ec0e /content/shell
parentd1ab97933260754f589f719dcb518525f39436a2 (diff)
downloadchromium_src-34eec7ffe3c9c05f58069ea4afce7e2d89843ac9.zip
chromium_src-34eec7ffe3c9c05f58069ea4afce7e2d89843ac9.tar.gz
chromium_src-34eec7ffe3c9c05f58069ea4afce7e2d89843ac9.tar.bz2
Ignore paths when matching patterns for extensions.
BUG=94399 TEST=lots Review URL: http://codereview.chromium.org/8312005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/shell_content_browser_client.cc10
-rw-r--r--content/shell/shell_content_browser_client.h10
2 files changed, 12 insertions, 8 deletions
diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc
index 18aae4e..1379e82 100644
--- a/content/shell/shell_content_browser_client.cc
+++ b/content/shell/shell_content_browser_client.cc
@@ -198,8 +198,9 @@ void ShellContentBrowserClient::RequestDesktopNotificationPermission(
WebKit::WebNotificationPresenter::Permission
ShellContentBrowserClient::CheckDesktopNotificationPermission(
- const GURL& source_url,
- const content::ResourceContext& context) {
+ const GURL& source_origin,
+ const content::ResourceContext& context,
+ int render_process_id) {
return WebKit::WebNotificationPresenter::PermissionAllowed;
}
@@ -217,9 +218,10 @@ void ShellContentBrowserClient::CancelDesktopNotification(
}
bool ShellContentBrowserClient::CanCreateWindow(
- const GURL& source_url,
+ const GURL& origin,
WindowContainerType container_type,
- const content::ResourceContext& context) {
+ const content::ResourceContext& context,
+ int render_process_id) {
return true;
}
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
index 382b207..2e44aa9 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;