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

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

Issue 2117693002: Fix crash issues if there is no resources pack in content shell Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | ui/base/resource/data_pack.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/reader.h" 5 #include "services/catalog/reader.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_enumerator.h" 8 #include "base/files/file_enumerator.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/json/json_file_value_serializer.h" 10 #include "base/json/json_file_value_serializer.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 } 174 }
175 175
176 void Reader::CreateEntryForName( 176 void Reader::CreateEntryForName(
177 const std::string& mojo_name, 177 const std::string& mojo_name,
178 EntryCache* cache, 178 EntryCache* cache,
179 const CreateEntryForNameCallback& entry_created_callback) { 179 const CreateEntryForNameCallback& entry_created_callback) {
180 std::string manifest_contents; 180 std::string manifest_contents;
181 if (manifest_provider_ && 181 if (manifest_provider_ &&
182 manifest_provider_->GetApplicationManifest(mojo_name, 182 manifest_provider_->GetApplicationManifest(mojo_name,
183 &manifest_contents)) { 183 &manifest_contents)) {
184 if (manifest_contents.empty())
185 return;
184 std::unique_ptr<base::Value> manifest_root = 186 std::unique_ptr<base::Value> manifest_root =
185 base::JSONReader::Read(manifest_contents); 187 base::JSONReader::Read(manifest_contents);
186 base::PostTaskAndReplyWithResult( 188 base::PostTaskAndReplyWithResult(
187 file_task_runner_.get(), FROM_HERE, 189 file_task_runner_.get(), FROM_HERE,
188 base::Bind(&ProcessManifest, base::Passed(&manifest_root), 190 base::Bind(&ProcessManifest, base::Passed(&manifest_root),
189 system_package_dir_), 191 system_package_dir_),
190 base::Bind(&Reader::OnReadManifest, weak_factory_.GetWeakPtr(), cache, 192 base::Bind(&Reader::OnReadManifest, weak_factory_.GetWeakPtr(), cache,
191 entry_created_callback)); 193 entry_created_callback));
192 } else { 194 } else {
193 base::PostTaskAndReplyWithResult( 195 base::PostTaskAndReplyWithResult(
(...skipping 13 matching lines...) Expand all
207 EntryCache* cache, 209 EntryCache* cache,
208 const CreateEntryForNameCallback& entry_created_callback, 210 const CreateEntryForNameCallback& entry_created_callback,
209 std::unique_ptr<Entry> entry) { 211 std::unique_ptr<Entry> entry) {
210 shell::mojom::ResolveResultPtr result = 212 shell::mojom::ResolveResultPtr result =
211 shell::mojom::ResolveResult::From(*entry); 213 shell::mojom::ResolveResult::From(*entry);
212 AddEntryToCache(cache, std::move(entry)); 214 AddEntryToCache(cache, std::move(entry));
213 entry_created_callback.Run(std::move(result)); 215 entry_created_callback.Run(std::move(result));
214 } 216 }
215 217
216 } // namespace catalog 218 } // namespace catalog
OLDNEW
« no previous file with comments | « no previous file | ui/base/resource/data_pack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698