| Index: chrome/renderer/web_apps.cc
|
| diff --git a/chrome/renderer/web_apps.cc b/chrome/renderer/web_apps.cc
|
| index fc0b28640494bc2e4aab22499fc82450e222cd5c..ac19d5259987247b5b9849a100495c07ebbaa860 100644
|
| --- a/chrome/renderer/web_apps.cc
|
| +++ b/chrome/renderer/web_apps.cc
|
| @@ -40,7 +40,7 @@ namespace {
|
|
|
| // Sizes a single size (the width or height) from a 'sizes' attribute. A size
|
| // matches must match the following regex: [1-9][0-9]*.
|
| -int ParseSingleIconSize(const string16& text) {
|
| +int ParseSingleIconSize(const base::string16& text) {
|
| // Size must not start with 0, and be between 0 and 9.
|
| if (text.empty() || !(text[0] >= L'1' && text[0] <= L'9'))
|
| return 0;
|
| @@ -59,8 +59,8 @@ int ParseSingleIconSize(const string16& text) {
|
| // Parses an icon size. An icon size must match the following regex:
|
| // [1-9][0-9]*x[1-9][0-9]*.
|
| // If the input couldn't be parsed, a size with a width/height == 0 is returned.
|
| -gfx::Size ParseIconSize(const string16& text) {
|
| - std::vector<string16> sizes;
|
| +gfx::Size ParseIconSize(const base::string16& text) {
|
| + std::vector<base::string16> sizes;
|
| base::SplitStringDontTrim(text, L'x', &sizes);
|
| if (sizes.size() != 2)
|
| return gfx::Size();
|
| @@ -96,11 +96,11 @@ void AddInstallIcon(const WebElement& link,
|
|
|
| } // namespace
|
|
|
| -bool ParseIconSizes(const string16& text,
|
| +bool ParseIconSizes(const base::string16& text,
|
| std::vector<gfx::Size>* sizes,
|
| bool* is_any) {
|
| *is_any = false;
|
| - std::vector<string16> size_strings;
|
| + std::vector<base::string16> size_strings;
|
| base::SplitStringAlongWhitespace(text, &size_strings);
|
| for (size_t i = 0; i < size_strings.size(); ++i) {
|
| if (EqualsASCII(size_strings[i], "any")) {
|
| @@ -121,7 +121,7 @@ bool ParseIconSizes(const string16& text,
|
|
|
| bool ParseWebAppFromWebDocument(WebFrame* frame,
|
| WebApplicationInfo* app_info,
|
| - string16* error) {
|
| + base::string16* error) {
|
| WebDocument document = frame->document();
|
| if (document.isNull())
|
| return true;
|
|
|