| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/renderer/web_apps.h" | 5 #include "chrome/renderer/web_apps.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "third_party/WebKit/public/web/WebDocument.h" | 21 #include "third_party/WebKit/public/web/WebDocument.h" |
| 22 #include "third_party/WebKit/public/web/WebElement.h" | 22 #include "third_party/WebKit/public/web/WebElement.h" |
| 23 #include "third_party/WebKit/public/web/WebFrame.h" | 23 #include "third_party/WebKit/public/web/WebFrame.h" |
| 24 #include "third_party/WebKit/public/web/WebNode.h" | 24 #include "third_party/WebKit/public/web/WebNode.h" |
| 25 #include "third_party/WebKit/public/web/WebNodeList.h" | 25 #include "third_party/WebKit/public/web/WebNodeList.h" |
| 26 #include "ui/base/l10n/l10n_util.h" | 26 #include "ui/base/l10n/l10n_util.h" |
| 27 #include "ui/base/resource/resource_bundle.h" | 27 #include "ui/base/resource/resource_bundle.h" |
| 28 #include "ui/gfx/size.h" | 28 #include "ui/gfx/size.h" |
| 29 #include "url/gurl.h" | 29 #include "url/gurl.h" |
| 30 | 30 |
| 31 using WebKit::WebDocument; | 31 using blink::WebDocument; |
| 32 using WebKit::WebElement; | 32 using blink::WebElement; |
| 33 using WebKit::WebFrame; | 33 using blink::WebFrame; |
| 34 using WebKit::WebNode; | 34 using blink::WebNode; |
| 35 using WebKit::WebNodeList; | 35 using blink::WebNodeList; |
| 36 using WebKit::WebString; | 36 using blink::WebString; |
| 37 | 37 |
| 38 namespace web_apps { | 38 namespace web_apps { |
| 39 namespace { | 39 namespace { |
| 40 | 40 |
| 41 // Sizes a single size (the width or height) from a 'sizes' attribute. A size | 41 // Sizes a single size (the width or height) from a 'sizes' attribute. A size |
| 42 // matches must match the following regex: [1-9][0-9]*. | 42 // matches must match the following regex: [1-9][0-9]*. |
| 43 int ParseSingleIconSize(const string16& text) { | 43 int ParseSingleIconSize(const string16& text) { |
| 44 // Size must not start with 0, and be between 0 and 9. | 44 // Size must not start with 0, and be between 0 and 9. |
| 45 if (text.empty() || !(text[0] >= L'1' && text[0] <= L'9')) | 45 if (text.empty() || !(text[0] >= L'1' && text[0] <= L'9')) |
| 46 return 0; | 46 return 0; |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 if (!app_info->app_url.is_valid()) | 162 if (!app_info->app_url.is_valid()) |
| 163 app_info->app_url = GURL(); | 163 app_info->app_url = GURL(); |
| 164 } | 164 } |
| 165 } | 165 } |
| 166 } | 166 } |
| 167 | 167 |
| 168 return true; | 168 return true; |
| 169 } | 169 } |
| 170 | 170 |
| 171 } // namespace web_apps | 171 } // namespace web_apps |
| OLD | NEW |