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

Side by Side Diff: remoting/host/daemon_process_win.cc

Issue 1101033002: Update {virtual,override} to follow C++11 style in remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « remoting/host/daemon_process_unittest.cc ('k') | remoting/host/desktop_process_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "remoting/host/daemon_process.h" 5 #include "remoting/host/daemon_process.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 const char kEnableVp9SwitchName[] = "enable-vp9"; 61 const char kEnableVp9SwitchName[] = "enable-vp9";
62 const char* kCopiedSwitchNames[] = 62 const char* kCopiedSwitchNames[] =
63 { switches::kV, switches::kVModule, kEnableVp9SwitchName }; 63 { switches::kV, switches::kVModule, kEnableVp9SwitchName };
64 64
65 class DaemonProcessWin : public DaemonProcess { 65 class DaemonProcessWin : public DaemonProcess {
66 public: 66 public:
67 DaemonProcessWin( 67 DaemonProcessWin(
68 scoped_refptr<AutoThreadTaskRunner> caller_task_runner, 68 scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
69 scoped_refptr<AutoThreadTaskRunner> io_task_runner, 69 scoped_refptr<AutoThreadTaskRunner> io_task_runner,
70 const base::Closure& stopped_callback); 70 const base::Closure& stopped_callback);
71 virtual ~DaemonProcessWin(); 71 ~DaemonProcessWin() override;
72 72
73 // WorkerProcessIpcDelegate implementation. 73 // WorkerProcessIpcDelegate implementation.
74 virtual void OnChannelConnected(int32 peer_pid) override; 74 void OnChannelConnected(int32 peer_pid) override;
75 virtual void OnPermanentError(int exit_code) override; 75 void OnPermanentError(int exit_code) override;
76 76
77 // DaemonProcess overrides. 77 // DaemonProcess overrides.
78 virtual void SendToNetwork(IPC::Message* message) override; 78 void SendToNetwork(IPC::Message* message) override;
79 virtual bool OnDesktopSessionAgentAttached( 79 bool OnDesktopSessionAgentAttached(
80 int terminal_id, 80 int terminal_id,
81 base::ProcessHandle desktop_process, 81 base::ProcessHandle desktop_process,
82 IPC::PlatformFileForTransit desktop_pipe) override; 82 IPC::PlatformFileForTransit desktop_pipe) override;
83 83
84 protected: 84 protected:
85 // DaemonProcess implementation. 85 // DaemonProcess implementation.
86 virtual scoped_ptr<DesktopSession> DoCreateDesktopSession( 86 scoped_ptr<DesktopSession> DoCreateDesktopSession(
87 int terminal_id, 87 int terminal_id,
88 const ScreenResolution& resolution, 88 const ScreenResolution& resolution,
89 bool virtual_terminal) override; 89 bool virtual_terminal) override;
90 virtual void DoCrashNetworkProcess( 90 void DoCrashNetworkProcess(
91 const tracked_objects::Location& location) override; 91 const tracked_objects::Location& location) override;
92 virtual void LaunchNetworkProcess() override; 92 void LaunchNetworkProcess() override;
93 93
94 // Changes the service start type to 'manual'. 94 // Changes the service start type to 'manual'.
95 void DisableAutoStart(); 95 void DisableAutoStart();
96 96
97 // Initializes the pairing registry on the host side by sending 97 // Initializes the pairing registry on the host side by sending
98 // ChromotingDaemonNetworkMsg_InitializePairingRegistry message. 98 // ChromotingDaemonNetworkMsg_InitializePairingRegistry message.
99 bool InitializePairingRegistry(); 99 bool InitializePairingRegistry();
100 100
101 // Opens the pairing registry keys. 101 // Opens the pairing registry keys.
102 bool OpenPairingRegistry(); 102 bool OpenPairingRegistry();
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 << "\\" << kPairingRegistrySecretsKeyName; 377 << "\\" << kPairingRegistrySecretsKeyName;
378 return false; 378 return false;
379 } 379 }
380 380
381 pairing_registry_privileged_key_.Set(privileged.Take()); 381 pairing_registry_privileged_key_.Set(privileged.Take());
382 pairing_registry_unprivileged_key_.Set(unprivileged.Take()); 382 pairing_registry_unprivileged_key_.Set(unprivileged.Take());
383 return true; 383 return true;
384 } 384 }
385 385
386 } // namespace remoting 386 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/daemon_process_unittest.cc ('k') | remoting/host/desktop_process_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698