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

Side by Side Diff: chrome/browser/extensions/api/terminal/terminal_private_api.cc

Issue 1991083002: Remove ExtensionFunction::SetResult(T*) overload. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU Created 4 years, 7 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 (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 "chrome/browser/extensions/api/terminal/terminal_private_api.h" 5 #include "chrome/browser/extensions/api/terminal/terminal_private_api.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
11 #include "base/memory/ptr_util.h"
11 #include "base/sys_info.h" 12 #include "base/sys_info.h"
12 #include "base/values.h" 13 #include "base/values.h"
13 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" 14 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
14 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/extensions/extension_tab_util.h" 16 #include "chrome/browser/extensions/extension_tab_util.h"
16 #include "chrome/common/extensions/api/terminal_private.h" 17 #include "chrome/common/extensions/api/terminal_private.h"
17 #include "chromeos/process_proxy/process_proxy_registry.h" 18 #include "chromeos/process_proxy/process_proxy_registry.h"
18 #include "content/public/browser/browser_context.h" 19 #include "content/public/browser/browser_context.h"
19 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
20 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 163
163 TerminalPrivateSendInputFunction::~TerminalPrivateSendInputFunction() {} 164 TerminalPrivateSendInputFunction::~TerminalPrivateSendInputFunction() {}
164 165
165 void TerminalPrivateOpenTerminalProcessFunction::RespondOnUIThread( 166 void TerminalPrivateOpenTerminalProcessFunction::RespondOnUIThread(
166 int terminal_id) { 167 int terminal_id) {
167 if (terminal_id < 0) { 168 if (terminal_id < 0) {
168 SetError("Failed to open process."); 169 SetError("Failed to open process.");
169 SendResponse(false); 170 SendResponse(false);
170 return; 171 return;
171 } 172 }
172 SetResult(new base::FundamentalValue(terminal_id)); 173 SetResult(base::MakeUnique<base::FundamentalValue>(terminal_id));
173 SendResponse(true); 174 SendResponse(true);
174 } 175 }
175 176
176 ExtensionFunction::ResponseAction TerminalPrivateSendInputFunction::Run() { 177 ExtensionFunction::ResponseAction TerminalPrivateSendInputFunction::Run() {
177 std::unique_ptr<SendInput::Params> params(SendInput::Params::Create(*args_)); 178 std::unique_ptr<SendInput::Params> params(SendInput::Params::Create(*args_));
178 EXTENSION_FUNCTION_VALIDATE(params.get()); 179 EXTENSION_FUNCTION_VALIDATE(params.get());
179 180
180 // Registry lives on the FILE thread. 181 // Registry lives on the FILE thread.
181 content::BrowserThread::PostTask(content::BrowserThread::FILE, FROM_HERE, 182 content::BrowserThread::PostTask(content::BrowserThread::FILE, FROM_HERE,
182 base::Bind(&TerminalPrivateSendInputFunction::SendInputOnFileThread, 183 base::Bind(&TerminalPrivateSendInputFunction::SendInputOnFileThread,
183 this, params->pid, params->input)); 184 this, params->pid, params->input));
184 return RespondLater(); 185 return RespondLater();
185 } 186 }
186 187
187 void TerminalPrivateSendInputFunction::SendInputOnFileThread( 188 void TerminalPrivateSendInputFunction::SendInputOnFileThread(
188 int terminal_id, 189 int terminal_id,
189 const std::string& text) { 190 const std::string& text) {
190 bool success = 191 bool success =
191 chromeos::ProcessProxyRegistry::Get()->SendInput(terminal_id, text); 192 chromeos::ProcessProxyRegistry::Get()->SendInput(terminal_id, text);
192 193
193 content::BrowserThread::PostTask( 194 content::BrowserThread::PostTask(
194 content::BrowserThread::UI, FROM_HERE, 195 content::BrowserThread::UI, FROM_HERE,
195 base::Bind(&TerminalPrivateSendInputFunction::RespondOnUIThread, this, 196 base::Bind(&TerminalPrivateSendInputFunction::RespondOnUIThread, this,
196 success)); 197 success));
197 } 198 }
198 199
199 void TerminalPrivateSendInputFunction::RespondOnUIThread(bool success) { 200 void TerminalPrivateSendInputFunction::RespondOnUIThread(bool success) {
200 SetResult(new base::FundamentalValue(success)); 201 SetResult(base::MakeUnique<base::FundamentalValue>(success));
201 SendResponse(true); 202 SendResponse(true);
202 } 203 }
203 204
204 TerminalPrivateCloseTerminalProcessFunction:: 205 TerminalPrivateCloseTerminalProcessFunction::
205 ~TerminalPrivateCloseTerminalProcessFunction() {} 206 ~TerminalPrivateCloseTerminalProcessFunction() {}
206 207
207 ExtensionFunction::ResponseAction 208 ExtensionFunction::ResponseAction
208 TerminalPrivateCloseTerminalProcessFunction::Run() { 209 TerminalPrivateCloseTerminalProcessFunction::Run() {
209 std::unique_ptr<CloseTerminalProcess::Params> params( 210 std::unique_ptr<CloseTerminalProcess::Params> params(
210 CloseTerminalProcess::Params::Create(*args_)); 211 CloseTerminalProcess::Params::Create(*args_));
(...skipping 14 matching lines...) Expand all
225 bool success = 226 bool success =
226 chromeos::ProcessProxyRegistry::Get()->CloseProcess(terminal_id); 227 chromeos::ProcessProxyRegistry::Get()->CloseProcess(terminal_id);
227 228
228 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, 229 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
229 base::Bind(&TerminalPrivateCloseTerminalProcessFunction:: 230 base::Bind(&TerminalPrivateCloseTerminalProcessFunction::
230 RespondOnUIThread, this, success)); 231 RespondOnUIThread, this, success));
231 } 232 }
232 233
233 void TerminalPrivateCloseTerminalProcessFunction::RespondOnUIThread( 234 void TerminalPrivateCloseTerminalProcessFunction::RespondOnUIThread(
234 bool success) { 235 bool success) {
235 SetResult(new base::FundamentalValue(success)); 236 SetResult(base::MakeUnique<base::FundamentalValue>(success));
236 SendResponse(true); 237 SendResponse(true);
237 } 238 }
238 239
239 TerminalPrivateOnTerminalResizeFunction:: 240 TerminalPrivateOnTerminalResizeFunction::
240 ~TerminalPrivateOnTerminalResizeFunction() {} 241 ~TerminalPrivateOnTerminalResizeFunction() {}
241 242
242 ExtensionFunction::ResponseAction 243 ExtensionFunction::ResponseAction
243 TerminalPrivateOnTerminalResizeFunction::Run() { 244 TerminalPrivateOnTerminalResizeFunction::Run() {
244 std::unique_ptr<OnTerminalResize::Params> params( 245 std::unique_ptr<OnTerminalResize::Params> params(
245 OnTerminalResize::Params::Create(*args_)); 246 OnTerminalResize::Params::Create(*args_));
(...skipping 13 matching lines...) Expand all
259 int height) { 260 int height) {
260 bool success = chromeos::ProcessProxyRegistry::Get()->OnTerminalResize( 261 bool success = chromeos::ProcessProxyRegistry::Get()->OnTerminalResize(
261 terminal_id, width, height); 262 terminal_id, width, height);
262 263
263 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, 264 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
264 base::Bind(&TerminalPrivateOnTerminalResizeFunction::RespondOnUIThread, 265 base::Bind(&TerminalPrivateOnTerminalResizeFunction::RespondOnUIThread,
265 this, success)); 266 this, success));
266 } 267 }
267 268
268 void TerminalPrivateOnTerminalResizeFunction::RespondOnUIThread(bool success) { 269 void TerminalPrivateOnTerminalResizeFunction::RespondOnUIThread(bool success) {
269 SetResult(new base::FundamentalValue(success)); 270 SetResult(base::MakeUnique<base::FundamentalValue>(success));
270 SendResponse(true); 271 SendResponse(true);
271 } 272 }
272 273
273 TerminalPrivateAckOutputFunction::~TerminalPrivateAckOutputFunction() {} 274 TerminalPrivateAckOutputFunction::~TerminalPrivateAckOutputFunction() {}
274 275
275 ExtensionFunction::ResponseAction TerminalPrivateAckOutputFunction::Run() { 276 ExtensionFunction::ResponseAction TerminalPrivateAckOutputFunction::Run() {
276 std::unique_ptr<AckOutput::Params> params(AckOutput::Params::Create(*args_)); 277 std::unique_ptr<AckOutput::Params> params(AckOutput::Params::Create(*args_));
277 EXTENSION_FUNCTION_VALIDATE(params.get()); 278 EXTENSION_FUNCTION_VALIDATE(params.get());
278 279
279 content::WebContents* caller_contents = GetSenderWebContents(); 280 content::WebContents* caller_contents = GetSenderWebContents();
(...skipping 14 matching lines...) Expand all
294 params->pid)); 295 params->pid));
295 296
296 return RespondNow(NoArguments()); 297 return RespondNow(NoArguments());
297 } 298 }
298 299
299 void TerminalPrivateAckOutputFunction::AckOutputOnFileThread(int terminal_id) { 300 void TerminalPrivateAckOutputFunction::AckOutputOnFileThread(int terminal_id) {
300 chromeos::ProcessProxyRegistry::Get()->AckOutput(terminal_id); 301 chromeos::ProcessProxyRegistry::Get()->AckOutput(terminal_id);
301 } 302 }
302 303
303 } // namespace extensions 304 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698