Index: chrome/installer/util/channel_info.h |
diff --git a/chrome/installer/util/channel_info.h b/chrome/installer/util/channel_info.h |
index f14811390af910d522735dfda1957096132e844c..f525c41ce1fa605d7f1517660ca74cfb05c804ef 100644 |
--- a/chrome/installer/util/channel_info.h |
+++ b/chrome/installer/util/channel_info.h |
@@ -7,6 +7,8 @@ |
#include <string> |
+#include "base/strings/string16.h" |
+ |
namespace base { |
namespace win { |
class RegKey; |
@@ -31,17 +33,20 @@ class ChannelInfo { |
// Returns false if the value could not be written to the registry. |
bool Write(base::win::RegKey* key) const; |
- const std::wstring& value() const { return value_; } |
- void set_value(const std::wstring& value) { value_ = value; } |
- bool Equals(const ChannelInfo& other) const { |
- return value_ == other.value_; |
- } |
+ // Updates |value| by removing deprecated contents. |
+ static void AuditValue(base::string16* value); |
+ |
+ const base::string16& value() const; |
+ |
+ void set_value(const base::string16& value); |
+ |
+ bool Equals(const ChannelInfo& other) const; |
// Determines the update channel for the value. Possible |channel_name| |
// results are the empty string (stable channel), "beta", and "dev". Returns |
// false (without modifying |channel_name|) if the channel could not be |
// determined. |
- bool GetChannelName(std::wstring* channel_name) const; |
+ bool GetChannelName(base::string16* channel_name) const; |
// Returns true if the -chrome modifier is present in the value. |
bool IsChrome() const; |
@@ -57,13 +62,6 @@ class ChannelInfo { |
// modified. |
bool SetChromeFrame(bool value); |
- // Returns true if the -applauncher modifier is present in the value. |
- bool IsAppLauncher() const; |
- |
- // Adds or removes the -applauncher modifier, returning true if the value is |
- // modified. |
- bool SetAppLauncher(bool value); |
- |
// Returns true if the -multi modifier is present in the value. |
bool IsMultiInstall() const; |
@@ -85,7 +83,7 @@ class ChannelInfo { |
// Returns the string identifying the current stage, or an empty string if the |
// -stage: modifier is not present in the value. |
- std::wstring GetStage() const; |
+ base::string16 GetStage() const; |
// Returns true if the -full suffix is present in the value. |
bool HasFullSuffix() const; |
@@ -113,7 +111,7 @@ class ChannelInfo { |
bool RemoveAllModifiersAndSuffixes(); |
private: |
- std::wstring value_; |
+ base::string16 value_; |
}; // class ChannelInfo |
} // namespace installer |