content/browser/service_manager/merge_dictionary.h - Issue 2387263002: Rename MojoShellContext -> ServiceManagerContext.

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/browser/service_manager/merge_dictionary.h

Issue 2387263002: Rename MojoShellContext -> ServiceManagerContext. (Closed)

Patch Set: . Created 4 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: content/browser/service_manager/merge_dictionary.h

diff --git a/content/browser/mojo/merge_dictionary.h b/content/browser/service_manager/merge_dictionary.h

similarity index 76%

rename from content/browser/mojo/merge_dictionary.h

rename to content/browser/service_manager/merge_dictionary.h

index b587d39a106fbd2e73983ffbd22008e059572234..b29e15969e6525a495f1b204e9d9d6ac875d4b0b 100644

--- a/content/browser/mojo/merge_dictionary.h

+++ b/content/browser/service_manager/merge_dictionary.h

@@ -2,8 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_

-#define CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_

+#ifndef CONTENT_BROWSER_SERVICE_MANAGER_MERGE_DICTIONARY_H_

+#define CONTENT_BROWSER_SERVICE_MANAGER_MERGE_DICTIONARY_H_

#include "base/values.h"

#include "content/common/content_export.h"

@@ -18,4 +18,4 @@ void CONTENT_EXPORT MergeDictionary(base::DictionaryValue* target,

} // namespace content

-#endif // CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_

+#endif // CONTENT_BROWSER_SERVICE_MANAGER_MERGE_DICTIONARY_H_