| OLD | NEW |
| 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 "cloud_print/service/win/chrome_launcher.h" | 5 #include "cloud_print/service/win/chrome_launcher.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 7 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
| 8 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 9 #include "base/files/file_util.h" | 11 #include "base/files/file_util.h" |
| 10 #include "base/files/scoped_temp_dir.h" | 12 #include "base/files/scoped_temp_dir.h" |
| 11 #include "base/json/json_reader.h" | 13 #include "base/json/json_reader.h" |
| 12 #include "base/json/json_writer.h" | 14 #include "base/json/json_writer.h" |
| 13 #include "base/process/process.h" | 15 #include "base/process/process.h" |
| 14 #include "base/process/process.h" | 16 #include "base/process/process.h" |
| 15 #include "base/values.h" | 17 #include "base/values.h" |
| 16 #include "base/win/registry.h" | 18 #include "base/win/registry.h" |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 LOG(ERROR) << "Chrome launch failed."; | 323 LOG(ERROR) << "Chrome launch failed."; |
| 322 return std::string(); | 324 return std::string(); |
| 323 } | 325 } |
| 324 if (!json.empty()) { | 326 if (!json.empty()) { |
| 325 // Close chrome because Service State is ready. | 327 // Close chrome because Service State is ready. |
| 326 CloseChrome(chrome_process.Pass(), thread_id); | 328 CloseChrome(chrome_process.Pass(), thread_id); |
| 327 return json; | 329 return json; |
| 328 } | 330 } |
| 329 } | 331 } |
| 330 } | 332 } |
| OLD | NEW |