summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/util/conditional_work_item_list.cc8
-rw-r--r--chrome/installer/util/conditional_work_item_list.h6
-rw-r--r--chrome/installer/util/shell_util.cc11
-rw-r--r--chrome/installer/util/shell_util.h5
4 files changed, 23 insertions, 7 deletions
diff --git a/chrome/installer/util/conditional_work_item_list.cc b/chrome/installer/util/conditional_work_item_list.cc
index ad66944..fcf1955 100644
--- a/chrome/installer/util/conditional_work_item_list.cc
+++ b/chrome/installer/util/conditional_work_item_list.cc
@@ -35,7 +35,13 @@ bool ConditionRunIfFileExists::ShouldRun() const {
return base::PathExists(key_path_);
}
+Not::Not(WorkItem::Condition* original_condition)
+ : original_condition_(original_condition) {
+}
+
+Not::~Not() {
+}
+
bool Not::ShouldRun() const {
return !original_condition_->ShouldRun();
}
-
diff --git a/chrome/installer/util/conditional_work_item_list.h b/chrome/installer/util/conditional_work_item_list.h
index 1e90a78..97cdd7a 100644
--- a/chrome/installer/util/conditional_work_item_list.h
+++ b/chrome/installer/util/conditional_work_item_list.h
@@ -48,13 +48,13 @@ class ConditionRunIfFileExists : public WorkItem::Condition {
// This class assumes ownership of original_condition.
class Not : public WorkItem::Condition {
public:
- explicit Not(WorkItem::Condition* original_condition)
- : original_condition_(original_condition) {}
+ explicit Not(WorkItem::Condition* original_condition);
+ ~Not();
+
bool ShouldRun() const;
private:
scoped_ptr<WorkItem::Condition> original_condition_;
};
-
#endif // CHROME_INSTALLER_UTIL_CONDITIONAL_WORK_ITEM_LIST_H_
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 469d10d..548fbb8 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -1568,6 +1568,17 @@ const wchar_t* ShellUtil::kRegCommand = L"command";
const wchar_t* ShellUtil::kRegDelegateExecute = L"DelegateExecute";
const wchar_t* ShellUtil::kRegOpenWithProgids = L"OpenWithProgids";
+ShellUtil::ShortcutProperties::ShortcutProperties(ShellChange level_in)
+ : level(level_in),
+ icon_index(0),
+ dual_mode(false),
+ pin_to_taskbar(false),
+ options(0U) {
+}
+
+ShellUtil::ShortcutProperties::~ShortcutProperties() {
+}
+
bool ShellUtil::QuickIsChromeRegisteredInHKLM(BrowserDistribution* dist,
const base::FilePath& chrome_exe,
const base::string16& suffix) {
diff --git a/chrome/installer/util/shell_util.h b/chrome/installer/util/shell_util.h
index 27e51e4..787e605 100644
--- a/chrome/installer/util/shell_util.h
+++ b/chrome/installer/util/shell_util.h
@@ -92,9 +92,8 @@ class ShellUtil {
PROPERTIES_DUAL_MODE = 1 << 6,
};
- explicit ShortcutProperties(ShellChange level_in)
- : level(level_in), icon_index(0), dual_mode(false),
- pin_to_taskbar(false), options(0U) {}
+ explicit ShortcutProperties(ShellChange level_in);
+ ~ShortcutProperties();
// Sets the target executable to launch from this shortcut.
// This is mandatory when creating a shortcut.