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..e4a670146260e8bcbf2f6c3558e63f350e5fa3f6 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; |
@@ -41,7 +43,7 @@ class ChannelInfo { |
// 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,11 +59,12 @@ class ChannelInfo { |
// modified. |
bool SetChromeFrame(bool value); |
- // Returns true if the -applauncher modifier is present in the value. |
+ // (Deprecated) 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. |
+ // (Deprecated) 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. |
@@ -85,7 +88,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 +116,7 @@ class ChannelInfo { |
bool RemoveAllModifiersAndSuffixes(); |
private: |
- std::wstring value_; |
+ base::string16 value_; |
}; // class ChannelInfo |
} // namespace installer |