chrome/test/base/testing_profile.h - Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call.

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/test/base/testing_profile.h

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge Created 8 years, 5 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

« chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc ('K') | « chrome/common/content_settings_types.h ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/base/testing_profile.h

diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h

index 750ee92d1f176f2bc22f31fcacdd7984d0011e7b..79af8131b1ca1056b75622cca55919e34db938dd 100644

--- a/chrome/test/base/testing_profile.h

+++ b/chrome/test/base/testing_profile.h

@@ -11,6 +11,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/scoped_temp_dir.h"

#include "base/timer.h"

+#include "chrome/browser/custom_handlers/protocol_handler_registry.h"

#include "chrome/browser/profiles/profile.h"

namespace content {

@@ -108,6 +109,10 @@ class TestingProfile : public Profile {

// registry is NULL.

void CreateProtocolHandlerRegistry();

+ // Creates a ProtocolHandlerRegistry with the provided delegate.

+ void CreateProtocolHandlerRegistry(

+ ProtocolHandlerRegistry::Delegate* delegate);

// Creates a WebDataService. If not invoked, the web data service is NULL.

void CreateWebDataService();