| 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 "base/base_switches.h" | 7 #include "base/base_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 base::JSONWriter::WriteWithOptions(dictionary, | 152 base::JSONWriter::WriteWithOptions(dictionary, |
| 153 base::JSONWriter::OPTIONS_PRETTY_PRINT, | 153 base::JSONWriter::OPTIONS_PRETTY_PRINT, |
| 154 &result); | 154 &result); |
| 155 return result; | 155 return result; |
| 156 } | 156 } |
| 157 | 157 |
| 158 void DeleteAutorunKeys(const base::FilePath& user_data_dir) { | 158 void DeleteAutorunKeys(const base::FilePath& user_data_dir) { |
| 159 base::win::RegKey key(HKEY_CURRENT_USER, kAutoRunKeyPath, KEY_SET_VALUE); | 159 base::win::RegKey key(HKEY_CURRENT_USER, kAutoRunKeyPath, KEY_SET_VALUE); |
| 160 if (!key.Valid()) | 160 if (!key.Valid()) |
| 161 return; | 161 return; |
| 162 std::vector<string16> to_delete; | 162 std::vector<base::string16> to_delete; |
| 163 | 163 |
| 164 base::FilePath abs_user_data_dir = base::MakeAbsoluteFilePath(user_data_dir); | 164 base::FilePath abs_user_data_dir = base::MakeAbsoluteFilePath(user_data_dir); |
| 165 | 165 |
| 166 { | 166 { |
| 167 base::win::RegistryValueIterator value(HKEY_CURRENT_USER, kAutoRunKeyPath); | 167 base::win::RegistryValueIterator value(HKEY_CURRENT_USER, kAutoRunKeyPath); |
| 168 for (; value.Valid(); ++value) { | 168 for (; value.Valid(); ++value) { |
| 169 if (value.Type() == REG_SZ && value.Value()) { | 169 if (value.Type() == REG_SZ && value.Value()) { |
| 170 CommandLine cmd = CommandLine::FromString(value.Value()); | 170 CommandLine cmd = CommandLine::FromString(value.Value()); |
| 171 if (cmd.GetSwitchValueASCII(switches::kProcessType) == | 171 if (cmd.GetSwitchValueASCII(switches::kProcessType) == |
| 172 switches::kServiceProcess && | 172 switches::kServiceProcess && |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 } | 338 } |
| 339 } else { | 339 } else { |
| 340 LOG(ERROR) << "Chrome launch failed."; | 340 LOG(ERROR) << "Chrome launch failed."; |
| 341 return result; | 341 return result; |
| 342 } | 342 } |
| 343 } | 343 } |
| 344 NOTREACHED(); | 344 NOTREACHED(); |
| 345 return std::string(); | 345 return std::string(); |
| 346 } | 346 } |
| 347 | 347 |
| OLD | NEW |