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/installer_state.h" | 5 #include "chrome/installer/util/installer_state.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <functional> | 8 #include <functional> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/file_version_info.h" | 12 #include "base/file_version_info.h" |
13 #include "base/files/file_enumerator.h" | 13 #include "base/files/file_enumerator.h" |
14 #include "base/files/file_util.h" | 14 #include "base/files/file_util.h" |
15 #include "base/logging.h" | 15 #include "base/logging.h" |
16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
17 #include "base/strings/string16.h" | |
grt (UTC plus 2)
2015/11/27 19:37:03
move this to the .h since it's needed by consumers
| |
17 #include "base/strings/string_util.h" | 18 #include "base/strings/string_util.h" |
18 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
19 #include "base/win/registry.h" | 20 #include "base/win/registry.h" |
20 #include "base/win/scoped_handle.h" | 21 #include "base/win/scoped_handle.h" |
21 #include "chrome/installer/util/delete_tree_work_item.h" | 22 #include "chrome/installer/util/delete_tree_work_item.h" |
22 #include "chrome/installer/util/helper.h" | 23 #include "chrome/installer/util/helper.h" |
23 #include "chrome/installer/util/install_util.h" | 24 #include "chrome/installer/util/install_util.h" |
24 #include "chrome/installer/util/installation_state.h" | 25 #include "chrome/installer/util/installation_state.h" |
25 #include "chrome/installer/util/master_preferences.h" | 26 #include "chrome/installer/util/master_preferences.h" |
26 #include "chrome/installer/util/master_preferences_constants.h" | 27 #include "chrome/installer/util/master_preferences_constants.h" |
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
688 } | 689 } |
689 if (!install_list->Do()) | 690 if (!install_list->Do()) |
690 LOG(ERROR) << "Failed to record installer error information in registry."; | 691 LOG(ERROR) << "Failed to record installer error information in registry."; |
691 } | 692 } |
692 | 693 |
693 bool InstallerState::RequiresActiveSetup() const { | 694 bool InstallerState::RequiresActiveSetup() const { |
694 return system_install() && FindProduct(BrowserDistribution::CHROME_BROWSER); | 695 return system_install() && FindProduct(BrowserDistribution::CHROME_BROWSER); |
695 } | 696 } |
696 | 697 |
697 } // namespace installer | 698 } // namespace installer |
OLD | NEW |