Commit c5ab93d7 authored by tfarina's avatar tfarina Committed by Commit bot

chrome/installer/util: Fix warnings found by clang chromium-style plugin on Windows.

http://build.chromium.org/p/chromium.fyi/builders/CrWinClang/builds/611/steps/compile/logs/stdio

This fixes the following kind or warnings:

warning(clang): [chromium-style] Complex constructor has an inline body.
warning(clang): [chromium-style] Complex class/struct needs an explicit out-of-line destructor.

BUG=467287
R=thakis@chromium.org,grt@chromium.org

Review URL: https://codereview.chromium.org/1111613002

Cr-Commit-Position: refs/heads/master@{#327217}
parent 1fd8cbba
...@@ -35,7 +35,13 @@ bool ConditionRunIfFileExists::ShouldRun() const { ...@@ -35,7 +35,13 @@ bool ConditionRunIfFileExists::ShouldRun() const {
return base::PathExists(key_path_); return base::PathExists(key_path_);
} }
Not::Not(WorkItem::Condition* original_condition)
: original_condition_(original_condition) {
}
Not::~Not() {
}
bool Not::ShouldRun() const { bool Not::ShouldRun() const {
return !original_condition_->ShouldRun(); return !original_condition_->ShouldRun();
} }
...@@ -48,13 +48,13 @@ class ConditionRunIfFileExists : public WorkItem::Condition { ...@@ -48,13 +48,13 @@ class ConditionRunIfFileExists : public WorkItem::Condition {
// This class assumes ownership of original_condition. // This class assumes ownership of original_condition.
class Not : public WorkItem::Condition { class Not : public WorkItem::Condition {
public: public:
explicit Not(WorkItem::Condition* original_condition) explicit Not(WorkItem::Condition* original_condition);
: original_condition_(original_condition) {} ~Not();
bool ShouldRun() const; bool ShouldRun() const;
private: private:
scoped_ptr<WorkItem::Condition> original_condition_; scoped_ptr<WorkItem::Condition> original_condition_;
}; };
#endif // CHROME_INSTALLER_UTIL_CONDITIONAL_WORK_ITEM_LIST_H_ #endif // CHROME_INSTALLER_UTIL_CONDITIONAL_WORK_ITEM_LIST_H_
...@@ -1568,6 +1568,17 @@ const wchar_t* ShellUtil::kRegCommand = L"command"; ...@@ -1568,6 +1568,17 @@ const wchar_t* ShellUtil::kRegCommand = L"command";
const wchar_t* ShellUtil::kRegDelegateExecute = L"DelegateExecute"; const wchar_t* ShellUtil::kRegDelegateExecute = L"DelegateExecute";
const wchar_t* ShellUtil::kRegOpenWithProgids = L"OpenWithProgids"; 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, bool ShellUtil::QuickIsChromeRegisteredInHKLM(BrowserDistribution* dist,
const base::FilePath& chrome_exe, const base::FilePath& chrome_exe,
const base::string16& suffix) { const base::string16& suffix) {
......
...@@ -92,9 +92,8 @@ class ShellUtil { ...@@ -92,9 +92,8 @@ class ShellUtil {
PROPERTIES_DUAL_MODE = 1 << 6, PROPERTIES_DUAL_MODE = 1 << 6,
}; };
explicit ShortcutProperties(ShellChange level_in) explicit ShortcutProperties(ShellChange level_in);
: level(level_in), icon_index(0), dual_mode(false), ~ShortcutProperties();
pin_to_taskbar(false), options(0U) {}
// Sets the target executable to launch from this shortcut. // Sets the target executable to launch from this shortcut.
// This is mandatory when creating a shortcut. // This is mandatory when creating a shortcut.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment