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

Side by Side Diff: components/nacl/renderer/nexe_load_manager.cc

Issue 1548203002: Convert Pass()→std::move() in //components/[n-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad headers Created 4 years, 11 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 "components/nacl/renderer/nexe_load_manager.h" 5 #include "components/nacl/renderer/nexe_load_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility>
8 9
9 #include "base/command_line.h" 10 #include "base/command_line.h"
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
12 #include "base/strings/string_tokenizer.h" 13 #include "base/strings/string_tokenizer.h"
13 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
14 #include "components/nacl/common/nacl_host_messages.h" 15 #include "components/nacl/common/nacl_host_messages.h"
15 #include "components/nacl/common/nacl_types.h" 16 #include "components/nacl/common/nacl_types.h"
16 #include "components/nacl/renderer/histogram.h" 17 #include "components/nacl/renderer/histogram.h"
17 #include "components/nacl/renderer/manifest_service_channel.h" 18 #include "components/nacl/renderer/manifest_service_channel.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 memcpy(crash_log_data.get(), 281 memcpy(crash_log_data.get(),
281 static_cast<char*>(shmem.memory()) + sizeof(uint32_t), 282 static_cast<char*>(shmem.memory()) + sizeof(uint32_t),
282 crash_log_length); 283 crash_log_length);
283 std::string crash_log(crash_log_data.get(), crash_log_length); 284 std::string crash_log(crash_log_data.get(), crash_log_length);
284 CopyCrashLogToJsConsole(crash_log); 285 CopyCrashLogToJsConsole(crash_log);
285 } 286 }
286 } 287 }
287 288
288 void NexeLoadManager::set_trusted_plugin_channel( 289 void NexeLoadManager::set_trusted_plugin_channel(
289 scoped_ptr<TrustedPluginChannel> channel) { 290 scoped_ptr<TrustedPluginChannel> channel) {
290 trusted_plugin_channel_ = channel.Pass(); 291 trusted_plugin_channel_ = std::move(channel);
291 } 292 }
292 293
293 void NexeLoadManager::set_manifest_service_channel( 294 void NexeLoadManager::set_manifest_service_channel(
294 scoped_ptr<ManifestServiceChannel> channel) { 295 scoped_ptr<ManifestServiceChannel> channel) {
295 manifest_service_channel_ = channel.Pass(); 296 manifest_service_channel_ = std::move(channel);
296 } 297 }
297 298
298 PP_NaClReadyState NexeLoadManager::nacl_ready_state() { 299 PP_NaClReadyState NexeLoadManager::nacl_ready_state() {
299 return nacl_ready_state_; 300 return nacl_ready_state_;
300 } 301 }
301 302
302 void NexeLoadManager::set_nacl_ready_state(PP_NaClReadyState ready_state) { 303 void NexeLoadManager::set_nacl_ready_state(PP_NaClReadyState ready_state) {
303 nacl_ready_state_ = ready_state; 304 nacl_ready_state_ = ready_state;
304 ppapi::ScopedPPVar ready_state_name( 305 ppapi::ScopedPPVar ready_state_name(
305 ppapi::ScopedPPVar::PassRef(), 306 ppapi::ScopedPPVar::PassRef(),
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 // to provide error handling. 441 // to provide error handling.
441 } 442 }
442 443
443 void NexeLoadManager::CopyCrashLogToJsConsole(const std::string& crash_log) { 444 void NexeLoadManager::CopyCrashLogToJsConsole(const std::string& crash_log) {
444 base::StringTokenizer t(crash_log, "\n"); 445 base::StringTokenizer t(crash_log, "\n");
445 while (t.GetNext()) 446 while (t.GetNext())
446 LogToConsole(t.token()); 447 LogToConsole(t.token());
447 } 448 }
448 449
449 } // namespace nacl 450 } // namespace nacl
OLDNEW
« no previous file with comments | « components/nacl/renderer/manifest_service_channel.cc ('k') | components/nacl/renderer/ppb_nacl_private_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698