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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/mojo/merge_dictionary.h
diff --git a/content/browser/mojo/merge_dictionary.h b/content/browser/mojo/merge_dictionary.h
deleted file mode 100644
index b587d39a106fbd2e73983ffbd22008e059572234..0000000000000000000000000000000000000000
--- a/content/browser/mojo/merge_dictionary.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// 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_
-
-#include "base/values.h"
-#include "content/common/content_export.h"
-
-namespace content {
-
-// Similar to base::DictionaryValue::MergeDictionary(), except concatenates
-// ListValue contents.
-// This is explicitly not part of base::DictionaryValue at brettw's request.
-void CONTENT_EXPORT MergeDictionary(base::DictionaryValue* target,
- const base::DictionaryValue* source);
-
-} // namespace content
-
-#endif // CONTENT_BROWSER_MOJO_MERGE_DICTIONARY_H_
« 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