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

Side by Side Diff: services/catalog/entry.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase 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:
View unified diff | Download patch
« no previous file with comments | « services/catalog/entry.h ('k') | services/catalog/entry_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 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 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "services/catalog/entry.h" 5 #include "services/catalog/entry.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "services/catalog/store.h" 8 #include "services/catalog/store.h"
9 #include "services/shell/public/cpp/names.h" 9 #include "services/service_manager/public/cpp/names.h"
10 10
11 namespace catalog { 11 namespace catalog {
12 namespace { 12 namespace {
13 13
14 bool ReadStringSet(const base::ListValue& list_value, 14 bool ReadStringSet(const base::ListValue& list_value,
15 std::set<std::string>* string_set) { 15 std::set<std::string>* string_set) {
16 DCHECK(string_set); 16 DCHECK(string_set);
17 for (const auto& value_value : list_value) { 17 for (const auto& value_value : list_value) {
18 std::string value; 18 std::string value;
19 if (!value_value->GetAsString(&value)) { 19 if (!value_value->GetAsString(&value)) {
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 catalog::mojom::EntryPtr 251 catalog::mojom::EntryPtr
252 TypeConverter<catalog::mojom::EntryPtr, catalog::Entry>::Convert( 252 TypeConverter<catalog::mojom::EntryPtr, catalog::Entry>::Convert(
253 const catalog::Entry& input) { 253 const catalog::Entry& input) {
254 catalog::mojom::EntryPtr result(catalog::mojom::Entry::New()); 254 catalog::mojom::EntryPtr result(catalog::mojom::Entry::New());
255 result->name = input.name(); 255 result->name = input.name();
256 result->display_name = input.display_name(); 256 result->display_name = input.display_name();
257 return result; 257 return result;
258 } 258 }
259 259
260 } // namespace mojo 260 } // namespace mojo
OLDNEW
« no previous file with comments | « services/catalog/entry.h ('k') | services/catalog/entry_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698