Chromium Code Reviews| Index: chrome/renderer/render_view.cc |
| diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc |
| index 9b0a283c2b0ff4289bd6aa94f05cd8cd07f420f6..47bf0e18020640905d0c888a6cae11b081253298 100644 |
| --- a/chrome/renderer/render_view.cc |
| +++ b/chrome/renderer/render_view.cc |
| @@ -42,6 +42,7 @@ |
| #include "chrome/common/renderer_preferences.h" |
| #include "chrome/common/thumbnail_score.h" |
| #include "chrome/common/url_constants.h" |
| +#include "chrome/common/web_apps.h" |
| #include "chrome/common/window_container_type.h" |
| #include "chrome/renderer/about_handler.h" |
| #include "chrome/renderer/audio_message_filter.h" |
| @@ -3911,9 +3912,11 @@ SkBitmap RenderView::ImageFromDataUrl(const GURL& url) const { |
| } |
| void RenderView::OnGetApplicationInfo(int page_id) { |
| - webkit_glue::WebApplicationInfo app_info; |
| - if (page_id == page_id_) |
| - webkit_glue::GetApplicationInfo(webview(), &app_info); |
| + WebApplicationInfo app_info; |
| + if (page_id == page_id_) { |
| + string16 error; |
| + ParseWebAppFromWebDocument(webview()->mainFrame(), &app_info, &error); |
|
Erik does not do reviews
2010/11/15 19:45:36
Since this can fail, don't we need to punt if it r
Aaron Boodman
2010/11/16 03:44:45
No, the calling code in the browser process just d
Erik does not do reviews
2010/11/16 23:43:02
ok
|
| + } |
| // Prune out any data URLs in the set of icons. The browser process expects |
| // any icon with a data URL to have originated from a favicon. We don't want |