Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Side by Side Diff: content/browser/mojo/merge_dictionary.h

Issue 2339593002: Revert of Enforce capability spec renderer <--> browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/mojo/merge_dictionary.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #ifndef CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_
6 #define CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_
7
8 #include "base/values.h"
9 #include "content/common/content_export.h"
10
11 namespace content {
12
13 // Similar to base::DictionaryValue::MergeDictionary(), except concatenates
14 // ListValue contents.
15 // This is explicitly not part of base::DictionaryValue at brettw's request.
16 void CONTENT_EXPORT MergeDictionary(base::DictionaryValue* target,
17 const base::DictionaryValue* source);
18
19 } // namespace content
20
21 #endif // CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/mojo/merge_dictionary.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698