Chromium Code Reviews| 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 "chrome/browser/google/google_update_win.h" | 5 #include "chrome/browser/google/google_update_win.h" |
| 6 | 6 |
| 7 #include <atlbase.h> | 7 #include <atlbase.h> |
| 8 #include <atlcom.h> | 8 #include <atlcom.h> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 349 } | 349 } |
| 350 | 350 |
| 351 // Runs on the caller's thread. | 351 // Runs on the caller's thread. |
| 352 UpdateCheckDriver::UpdateCheckDriver( | 352 UpdateCheckDriver::UpdateCheckDriver( |
| 353 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, | 353 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
| 354 const std::string& locale, | 354 const std::string& locale, |
| 355 bool install_update_if_possible, | 355 bool install_update_if_possible, |
| 356 gfx::AcceleratedWidget elevation_window, | 356 gfx::AcceleratedWidget elevation_window, |
| 357 const base::WeakPtr<UpdateCheckDelegate>& delegate) | 357 const base::WeakPtr<UpdateCheckDelegate>& delegate) |
| 358 : task_runner_(task_runner), | 358 : task_runner_(task_runner), |
| 359 allowed_retries_(kGoogleAllowedRetries), | |
|
scottmg
2015/10/03 05:21:50
This seems unrelated, but is apparently broken on
| |
| 359 result_runner_(base::ThreadTaskRunnerHandle::Get()), | 360 result_runner_(base::ThreadTaskRunnerHandle::Get()), |
| 360 allowed_retries_(kGoogleAllowedRetries), | |
| 361 locale_(locale), | 361 locale_(locale), |
| 362 install_update_if_possible_(install_update_if_possible), | 362 install_update_if_possible_(install_update_if_possible), |
| 363 elevation_window_(elevation_window), | 363 elevation_window_(elevation_window), |
| 364 delegate_(delegate), | 364 delegate_(delegate), |
| 365 system_level_install_(false), | 365 system_level_install_(false), |
| 366 last_reported_progress_(0), | 366 last_reported_progress_(0), |
| 367 status_(UPGRADE_ERROR), | 367 status_(UPGRADE_ERROR), |
| 368 error_code_(GOOGLE_UPDATE_NO_ERROR), | 368 error_code_(GOOGLE_UPDATE_NO_ERROR), |
| 369 hresult_(S_OK), | 369 hresult_(S_OK), |
| 370 installer_exit_code_(-1) { | 370 installer_exit_code_(-1) { |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 792 const GoogleUpdate3ClassFactory& google_update_factory) { | 792 const GoogleUpdate3ClassFactory& google_update_factory) { |
| 793 if (g_google_update_factory) { | 793 if (g_google_update_factory) { |
| 794 delete g_google_update_factory; | 794 delete g_google_update_factory; |
| 795 g_google_update_factory = nullptr; | 795 g_google_update_factory = nullptr; |
| 796 } | 796 } |
| 797 if (!google_update_factory.is_null()) { | 797 if (!google_update_factory.is_null()) { |
| 798 g_google_update_factory = | 798 g_google_update_factory = |
| 799 new GoogleUpdate3ClassFactory(google_update_factory); | 799 new GoogleUpdate3ClassFactory(google_update_factory); |
| 800 } | 800 } |
| 801 } | 801 } |
| OLD | NEW |