chrome/browser/renderer_host/resource_message_filter.cc - Issue 3796011: Merge 62261, 62267, 62265 & 62679...

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/resource_message_filter.cc

Issue 3796011: Merge 62261, 62267, 62265 & 62679... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552/src/

Patch Set: Created 10 years, 2 months ago

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

Jump to:

Index: chrome/browser/renderer_host/resource_message_filter.cc

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

--- chrome/browser/renderer_host/resource_message_filter.cc (revision 62937)

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

@@ -12,11 +12,13 @@

#endif

#include "base/file_path.h"

#include "base/file_util.h"

+#include "base/file_util.h"

#include "base/histogram.h"

#include "base/process_util.h"

#include "base/shared_memory.h"

#include "base/sys_string_conversions.h"

#include "base/thread.h"

+#include "base/thread.h"

#include "base/utf_string_conversions.h"

#include "base/worker_pool.h"

#include "chrome/browser/appcache/appcache_dispatcher_host.h"

@@ -34,6 +36,7 @@

#include "chrome/browser/file_system/file_system_host_context.h"

#include "chrome/browser/geolocation/geolocation_dispatcher_host.h"

#include "chrome/browser/geolocation/geolocation_permission_context.h"

+#include "chrome/browser/geolocation/geolocation_permission_context.h"

#include "chrome/browser/gpu_process_host.h"

#include "chrome/browser/host_zoom_map.h"

#include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h"

« no previous file with comments | « chrome/browser/plugin_service.cc ('k') | chrome/renderer/render_view.cc » ('j') | no next file with comments »