Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(689)

Side by Side Diff: chrome/renderer/render_view.cc

Issue 6672065: Support touch icon in FaviconHelper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Only update the FAVICON data to the NavigationEntry. Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 2165 matching lines...) Expand 10 before | Expand all | Expand 10 after
2176 return; 2176 return;
2177 } 2177 }
2178 2178
2179 is_loading_ = false; 2179 is_loading_ = false;
2180 2180
2181 // NOTE: For now we're doing the safest thing, and sending out notification 2181 // NOTE: For now we're doing the safest thing, and sending out notification
2182 // when done loading. This currently isn't an issue as the favicon is only 2182 // when done loading. This currently isn't an issue as the favicon is only
2183 // displayed when done loading. Ideally we would send notification when 2183 // displayed when done loading. Ideally we would send notification when
2184 // finished parsing the head, but webkit doesn't support that yet. 2184 // finished parsing the head, but webkit doesn't support that yet.
2185 // The feed discovery code would also benefit from access to the head. 2185 // The feed discovery code would also benefit from access to the head.
2186
2187 // TODO : Get both favicon and touch icon url, and send them to the browser.
sky 2011/03/18 17:33:37 This should only be done if needed.
2186 GURL favicon_url(webview()->mainFrame()->favIconURL()); 2188 GURL favicon_url(webview()->mainFrame()->favIconURL());
2187 if (!favicon_url.is_empty()) 2189 if (!favicon_url.is_empty())
2188 Send(new ViewHostMsg_UpdateFaviconURL(routing_id_, page_id_, favicon_url)); 2190 Send(new ViewHostMsg_UpdateFaviconURL(routing_id_, page_id_, favicon_url));
2189 2191
2190 AddGURLSearchProvider(webview()->mainFrame()->openSearchDescriptionURL(), 2192 AddGURLSearchProvider(webview()->mainFrame()->openSearchDescriptionURL(),
2191 ViewHostMsg_PageHasOSDD_Type::Autodetected()); 2193 ViewHostMsg_PageHasOSDD_Type::Autodetected());
2192 2194
2193 Send(new ViewHostMsg_DidStopLoading(routing_id_)); 2195 Send(new ViewHostMsg_DidStopLoading(routing_id_));
2194 2196
2195 if (load_progress_tracker_ != NULL) 2197 if (load_progress_tracker_ != NULL)
(...skipping 3409 matching lines...) Expand 10 before | Expand all | Expand 10 after
5605 const webkit_glue::CustomContextMenuContext& custom_context) { 5607 const webkit_glue::CustomContextMenuContext& custom_context) {
5606 if (custom_context.is_pepper_menu) 5608 if (custom_context.is_pepper_menu)
5607 pepper_delegate_.OnContextMenuClosed(custom_context); 5609 pepper_delegate_.OnContextMenuClosed(custom_context);
5608 else 5610 else
5609 context_menu_node_.reset(); 5611 context_menu_node_.reset();
5610 } 5612 }
5611 5613
5612 void RenderView::OnNetworkStateChanged(bool online) { 5614 void RenderView::OnNetworkStateChanged(bool online) {
5613 WebNetworkStateNotifier::setOnLine(online); 5615 WebNetworkStateNotifier::setOnLine(online);
5614 } 5616 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698