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

Side by Side Diff: chrome/utility/extensions/extensions_handler.cc

Issue 2803023005: Switch base::Value typemapping to be by value instead of by unique_ptr.
Patch Set: Created 3 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/utility/extensions/extensions_handler.h" 5 #include "chrome/utility/extensions/extensions_handler.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 std::move(source), mime_type, get_attached_images); 66 std::move(source), mime_type, get_attached_images);
67 parser->Start(base::Bind(&MediaParserImpl::ParseMediaMetadataDone, callback, 67 parser->Start(base::Bind(&MediaParserImpl::ParseMediaMetadataDone, callback,
68 base::Owned(parser))); 68 base::Owned(parser)));
69 } 69 }
70 70
71 static void ParseMediaMetadataDone( 71 static void ParseMediaMetadataDone(
72 const ParseMediaMetadataCallback& callback, 72 const ParseMediaMetadataCallback& callback,
73 metadata::MediaMetadataParser* /* parser */, 73 metadata::MediaMetadataParser* /* parser */,
74 const extensions::api::media_galleries::MediaMetadata& metadata, 74 const extensions::api::media_galleries::MediaMetadata& metadata,
75 const std::vector<metadata::AttachedImage>& attached_images) { 75 const std::vector<metadata::AttachedImage>& attached_images) {
76 callback.Run(true, metadata.ToValue(), attached_images); 76 callback.Run(true, *metadata.ToValue(), attached_images);
77 } 77 }
78 78
79 void CheckMediaFile(base::TimeDelta decode_time, 79 void CheckMediaFile(base::TimeDelta decode_time,
80 base::File file, 80 base::File file,
81 const CheckMediaFileCallback& callback) override { 81 const CheckMediaFileCallback& callback) override {
82 #if !defined(MEDIA_DISABLE_FFMPEG) 82 #if !defined(MEDIA_DISABLE_FFMPEG)
83 media::MediaFileChecker checker(std::move(file)); 83 media::MediaFileChecker checker(std::move(file));
84 callback.Run(checker.Start(decode_time)); 84 callback.Run(checker.Start(decode_time));
85 #else 85 #else
86 callback.Run(false); 86 callback.Run(false);
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 picasa::PicasaAlbumsIndexer indexer(album_uids); 273 picasa::PicasaAlbumsIndexer indexer(album_uids);
274 indexer.ParseFolderINI(folders_inis); 274 indexer.ParseFolderINI(folders_inis);
275 content::UtilityThread::Get()->Send( 275 content::UtilityThread::Get()->Send(
276 new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished( 276 new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished(
277 indexer.albums_images())); 277 indexer.albums_images()));
278 content::UtilityThread::Get()->ReleaseProcessIfNeeded(); 278 content::UtilityThread::Get()->ReleaseProcessIfNeeded();
279 } 279 }
280 #endif // defined(OS_WIN) || defined(OS_MACOSX) 280 #endif // defined(OS_WIN) || defined(OS_MACOSX)
281 281
282 } // namespace extensions 282 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698