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

Side by Side Diff: components/nacl/loader/nacl_helper_win_64.cc

Issue 1752233002: Convert Pass()→std::move() on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/loader/nacl_helper_win_64.h" 5 #include "components/nacl/loader/nacl_helper_win_64.h"
6 6
7 #include <string> 7 #include <string>
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/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
12 #include "base/power_monitor/power_monitor.h" 13 #include "base/power_monitor/power_monitor.h"
13 #include "base/power_monitor/power_monitor_device_source.h" 14 #include "base/power_monitor/power_monitor_device_source.h"
14 #include "base/process/launch.h" 15 #include "base/process/launch.h"
15 #include "base/process/memory.h" 16 #include "base/process/memory.h"
16 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
17 #include "base/timer/hi_res_timer_manager.h" 18 #include "base/timer/hi_res_timer_manager.h"
(...skipping 12 matching lines...) Expand all
30 31
31 namespace { 32 namespace {
32 // main() routine for the NaCl broker process. 33 // main() routine for the NaCl broker process.
33 // This is necessary for supporting NaCl in Chrome on Win64. 34 // This is necessary for supporting NaCl in Chrome on Win64.
34 int NaClBrokerMain(const content::MainFunctionParams& parameters) { 35 int NaClBrokerMain(const content::MainFunctionParams& parameters) {
35 base::MessageLoopForIO main_message_loop; 36 base::MessageLoopForIO main_message_loop;
36 base::PlatformThread::SetName("CrNaClBrokerMain"); 37 base::PlatformThread::SetName("CrNaClBrokerMain");
37 38
38 scoped_ptr<base::PowerMonitorSource> power_monitor_source( 39 scoped_ptr<base::PowerMonitorSource> power_monitor_source(
39 new base::PowerMonitorDeviceSource()); 40 new base::PowerMonitorDeviceSource());
40 base::PowerMonitor power_monitor(power_monitor_source.Pass()); 41 base::PowerMonitor power_monitor(std::move(power_monitor_source));
41 base::HighResolutionTimerManager hi_res_timer_manager; 42 base::HighResolutionTimerManager hi_res_timer_manager;
42 43
43 NaClBrokerListener listener; 44 NaClBrokerListener listener;
44 listener.Listen(); 45 listener.Listen();
45 46
46 return 0; 47 return 0;
47 } 48 }
48 49
49 } // namespace 50 } // namespace
50 51
(...skipping 29 matching lines...) Expand all
80 return NaClMain(main_params); 81 return NaClMain(main_params);
81 82
82 if (process_type == switches::kNaClBrokerProcess) 83 if (process_type == switches::kNaClBrokerProcess)
83 return NaClBrokerMain(main_params); 84 return NaClBrokerMain(main_params);
84 85
85 CHECK(false) << "Unknown NaCl 64 process."; 86 CHECK(false) << "Unknown NaCl 64 process.";
86 return -1; 87 return -1;
87 } 88 }
88 89
89 } // namespace nacl 90 } // namespace nacl
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698