chrome/browser/renderer_host/chrome_render_message_filter.cc - Issue 104833006: Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/renderer_host/chrome_render_message_filter.cc

Issue 104833006: Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/renderer_host/chrome_render_message_filter.h ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/chrome_render_message_filter.cc

===================================================================

--- chrome/browser/renderer_host/chrome_render_message_filter.cc (revision 241294)

+++ chrome/browser/renderer_host/chrome_render_message_filter.cc (working copy)

@@ -546,7 +546,7 @@

}

void ChromeRenderMessageFilter::OnAllowDatabase(

- int render_view_id,

+ int render_frame_id,

const GURL& origin_url,

const GURL& top_origin_url,

const base::string16& name,

@@ -557,11 +557,11 @@

BrowserThread::PostTask(

BrowserThread::UI, FROM_HERE,

base::Bind(&TabSpecificContentSettings::WebDatabaseAccessed,

- render_process_id_, render_view_id, origin_url, name,

+ render_process_id_, render_frame_id, origin_url, name,

display_name, !*allowed));

}

-void ChromeRenderMessageFilter::OnAllowDOMStorage(int render_view_id,

+void ChromeRenderMessageFilter::OnAllowDOMStorage(int render_frame_id,

const GURL& origin_url,

const GURL& top_origin_url,

bool local,

@@ -572,11 +572,11 @@

BrowserThread::PostTask(

BrowserThread::UI, FROM_HERE,

base::Bind(&TabSpecificContentSettings::DOMStorageAccessed,

- render_process_id_, render_view_id, origin_url, local,

+ render_process_id_, render_frame_id, origin_url, local,

!*allowed));

}

-void ChromeRenderMessageFilter::OnAllowFileSystem(int render_view_id,

+void ChromeRenderMessageFilter::OnAllowFileSystem(int render_frame_id,

const GURL& origin_url,

const GURL& top_origin_url,

bool* allowed) {

@@ -586,10 +586,10 @@

BrowserThread::PostTask(

BrowserThread::UI, FROM_HERE,

base::Bind(&TabSpecificContentSettings::FileSystemAccessed,

- render_process_id_, render_view_id, origin_url, !*allowed));

+ render_process_id_, render_frame_id, origin_url, !*allowed));

}

-void ChromeRenderMessageFilter::OnAllowIndexedDB(int render_view_id,

+void ChromeRenderMessageFilter::OnAllowIndexedDB(int render_frame_id,

const GURL& origin_url,

const GURL& top_origin_url,

const base::string16& name,

@@ -599,7 +599,7 @@

BrowserThread::PostTask(

BrowserThread::UI, FROM_HERE,

base::Bind(&TabSpecificContentSettings::IndexedDBAccessed,

- render_process_id_, render_view_id, origin_url, name,

+ render_process_id_, render_frame_id, origin_url, name,

!*allowed));

}