chrome/browser/profiles/off_the_record_profile_impl.h - Issue 10696176: Move UserScript and related into extensions namespace

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/profiles/off_the_record_profile_impl.h

Issue 10696176: Move UserScript and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Latest master for cq 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:

Index: chrome/browser/profiles/off_the_record_profile_impl.h

diff --git a/chrome/browser/profiles/off_the_record_profile_impl.h b/chrome/browser/profiles/off_the_record_profile_impl.h

index d0aac2bb4f9d8d0da02d60995cf286c16af735e9..3c05723a9605d39291778ecd1b85d3bf2687a0c7 100644

--- a/chrome/browser/profiles/off_the_record_profile_impl.h

+++ b/chrome/browser/profiles/off_the_record_profile_impl.h

@@ -40,7 +40,7 @@ class OffTheRecordProfileImpl : public Profile,

virtual Profile* GetOriginalProfile() OVERRIDE;

virtual VisitedLinkMaster* GetVisitedLinkMaster() OVERRIDE;

virtual ExtensionService* GetExtensionService() OVERRIDE;

- virtual UserScriptMaster* GetUserScriptMaster() OVERRIDE;

+ virtual extensions::UserScriptMaster* GetUserScriptMaster() OVERRIDE;

virtual ExtensionProcessManager* GetExtensionProcessManager() OVERRIDE;

virtual ExtensionEventRouter* GetExtensionEventRouter() OVERRIDE;

virtual ExtensionSpecialStoragePolicy*