content/shell/browser/layout_test/layout_test_content_browser_client.cc - Issue 659073004: Content Shell: Move ShellMessageFilter to LayoutTestMessageFilter.

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: content/shell/browser/layout_test/layout_test_content_browser_client.cc

Issue 659073004: Content Shell: Move ShellMessageFilter to LayoutTestMessageFilter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cs-move-cbc

Patch Set: Created 6 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:

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

Download patch

« no previous file with comments | « content/shell/browser/layout_test/layout_test_content_browser_client.h ('k') | content/shell/browser/layout_test/layout_test_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/layout_test/layout_test_content_browser_client.cc

diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc

index c6b033f612a9738b20416ec2ab799afe4e6f61a6..5194da29cd364dc29a82b1b2dcd9efbc1767f04d 100644

--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc

+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc

@@ -4,8 +4,15 @@

#include "content/shell/browser/layout_test/layout_test_content_browser_client.h"

+#include "content/public/browser/browser_context.h"

#include "content/public/browser/browser_thread.h"

+#include "content/public/browser/render_process_host.h"

+#include "content/public/browser/storage_partition.h"

+#include "content/shell/browser/layout_test/layout_test_message_filter.h"

#include "content/shell/browser/layout_test/layout_test_notification_manager.h"

+#include "content/shell/browser/shell_browser_context.h"

+#include "content/shell/common/shell_messages.h"

+#include "content/shell/common/webkit_test_helpers.h"

namespace content {

namespace {

@@ -50,6 +57,21 @@ LayoutTestContentBrowserClient::GetLayoutTestNotificationManager() {

return layout_test_notification_manager_.get();

}

+void LayoutTestContentBrowserClient::RenderProcessWillLaunch(

+ RenderProcessHost* host) {

+ ShellContentBrowserClient::RenderProcessWillLaunch(host);

+ StoragePartition* partition =

+ BrowserContext::GetDefaultStoragePartition(browser_context());

+ host->AddFilter(new LayoutTestMessageFilter(

+ host->GetID(),

+ partition->GetDatabaseTracker(),

+ partition->GetQuotaManager(),

+ partition->GetURLRequestContext()));

+ host->Send(new ShellViewMsg_SetWebKitSourceDir(GetWebKitRootDirFilePath()));

Mike West 2014/10/16 19:42:32 Nit: We should totally rename these to Blink at so

Peter Beverloo 2014/10/17 11:07:43 Agreed, but I'd prefer to avoid changing logic/nam

void LayoutTestContentBrowserClient::RequestDesktopNotificationPermission(

const GURL& source_origin,

RenderFrameHost* render_frame_host,