| 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/installer/util/google_update_settings.h" | 5 #include "chrome/installer/util/google_update_settings.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <shlwapi.h> // For SHDeleteKey. | 8 #include <shlwapi.h> // For SHDeleteKey. |
| 9 | 9 |
| 10 #include "base/base_paths.h" | 10 #include "base/base_paths.h" |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 const wchar_t* const plain[] = { | 415 const wchar_t* const plain[] = { |
| 416 L"", | 416 L"", |
| 417 L"1.1", | 417 L"1.1", |
| 418 L"1.1-dev" | 418 L"1.1-dev" |
| 419 }; | 419 }; |
| 420 const wchar_t* const full[] = { | 420 const wchar_t* const full[] = { |
| 421 L"-full", | 421 L"-full", |
| 422 L"1.1-full", | 422 L"1.1-full", |
| 423 L"1.1-dev-full" | 423 L"1.1-dev-full" |
| 424 }; | 424 }; |
| 425 COMPILE_ASSERT(arraysize(full) == arraysize(plain), bad_full_array_size); | 425 static_assert(arraysize(full) == arraysize(plain), "bad full array size"); |
| 426 const wchar_t* const multifail[] = { | 426 const wchar_t* const multifail[] = { |
| 427 L"-multifail", | 427 L"-multifail", |
| 428 L"1.1-multifail", | 428 L"1.1-multifail", |
| 429 L"1.1-dev-multifail" | 429 L"1.1-dev-multifail" |
| 430 }; | 430 }; |
| 431 COMPILE_ASSERT(arraysize(multifail) == arraysize(plain), | 431 static_assert(arraysize(multifail) == arraysize(plain), |
| 432 bad_multifail_array_size); | 432 "bad multifail array size"); |
| 433 const wchar_t* const multifail_full[] = { | 433 const wchar_t* const multifail_full[] = { |
| 434 L"-multifail-full", | 434 L"-multifail-full", |
| 435 L"1.1-multifail-full", | 435 L"1.1-multifail-full", |
| 436 L"1.1-dev-multifail-full" | 436 L"1.1-dev-multifail-full" |
| 437 }; | 437 }; |
| 438 COMPILE_ASSERT(arraysize(multifail_full) == arraysize(plain), | 438 static_assert(arraysize(multifail_full) == arraysize(plain), |
| 439 bad_multifail_full_array_size); | 439 "bad multifail_full array size"); |
| 440 const wchar_t* const* input_arrays[] = { | 440 const wchar_t* const* input_arrays[] = { |
| 441 plain, | 441 plain, |
| 442 full, | 442 full, |
| 443 multifail, | 443 multifail, |
| 444 multifail_full | 444 multifail_full |
| 445 }; | 445 }; |
| 446 ChannelInfo v; | 446 ChannelInfo v; |
| 447 for (int type_idx = 0; type_idx < arraysize(archive_types); ++type_idx) { | 447 for (int type_idx = 0; type_idx < arraysize(archive_types); ++type_idx) { |
| 448 const installer::ArchiveType archive_type = archive_types[type_idx]; | 448 const installer::ArchiveType archive_type = archive_types[type_idx]; |
| 449 for (int result_idx = 0; result_idx < arraysize(results); ++result_idx) { | 449 for (int result_idx = 0; result_idx < arraysize(results); ++result_idx) { |
| (...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1368 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, | 1368 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, |
| 1369 StatsState::FALSE_SETTING, StatsState::FALSE_SETTING), | 1369 StatsState::FALSE_SETTING, StatsState::FALSE_SETTING), |
| 1370 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, | 1370 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, |
| 1371 StatsState::FALSE_SETTING, StatsState::TRUE_SETTING), | 1371 StatsState::FALSE_SETTING, StatsState::TRUE_SETTING), |
| 1372 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, | 1372 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, |
| 1373 StatsState::TRUE_SETTING, StatsState::NO_SETTING), | 1373 StatsState::TRUE_SETTING, StatsState::NO_SETTING), |
| 1374 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, | 1374 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, |
| 1375 StatsState::TRUE_SETTING, StatsState::FALSE_SETTING), | 1375 StatsState::TRUE_SETTING, StatsState::FALSE_SETTING), |
| 1376 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, | 1376 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, |
| 1377 StatsState::TRUE_SETTING, StatsState::TRUE_SETTING))); | 1377 StatsState::TRUE_SETTING, StatsState::TRUE_SETTING))); |
| OLD | NEW |