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

Side by Side Diff: chrome/browser/prerender/prerender_manager.cc

Issue 6693021: fav icon -> favicon. Pass 5: fav_icon -> favicon (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/possible_url_model.cc ('k') | chrome/browser/profile_import_process_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser/prerender/prerender_manager.h" 5 #include "chrome/browser/prerender/prerender_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 ViewHostMsg_FrameNavigate_Params* p = pc->navigate_params(); 158 ViewHostMsg_FrameNavigate_Params* p = pc->navigate_params();
159 if (p != NULL) 159 if (p != NULL)
160 tc->DidNavigate(rvh, *p); 160 tc->DidNavigate(rvh, *p);
161 161
162 string16 title = pc->title(); 162 string16 title = pc->title();
163 if (!title.empty()) 163 if (!title.empty())
164 tc->UpdateTitle(rvh, pc->page_id(), UTF16ToWideHack(title)); 164 tc->UpdateTitle(rvh, pc->page_id(), UTF16ToWideHack(title));
165 165
166 GURL icon_url = pc->icon_url(); 166 GURL icon_url = pc->icon_url();
167 if (!icon_url.is_empty()) 167 if (!icon_url.is_empty())
168 tc->fav_icon_helper().OnUpdateFaviconURL(pc->page_id(), icon_url); 168 tc->favicon_helper().OnUpdateFaviconURL(pc->page_id(), icon_url);
169 169
170 if (pc->has_stopped_loading()) 170 if (pc->has_stopped_loading())
171 tc->DidStopLoading(); 171 tc->DidStopLoading();
172 172
173 return true; 173 return true;
174 } 174 }
175 175
176 void PrerenderManager::RemoveEntry(PrerenderContents* entry) { 176 void PrerenderManager::RemoveEntry(PrerenderContents* entry) {
177 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 177 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
178 for (std::list<PrerenderContentsData>::iterator it = prerender_list_.begin(); 178 for (std::list<PrerenderContentsData>::iterator it = prerender_list_.begin();
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 323
324 void PrerenderManager::MarkTabContentsAsNotPrerendered(TabContents* tc) { 324 void PrerenderManager::MarkTabContentsAsNotPrerendered(TabContents* tc) {
325 prerendered_tc_set_.erase(tc); 325 prerendered_tc_set_.erase(tc);
326 } 326 }
327 327
328 bool PrerenderManager::IsTabContentsPrerendered(TabContents* tc) const { 328 bool PrerenderManager::IsTabContentsPrerendered(TabContents* tc) const {
329 return prerendered_tc_set_.count(tc) > 0; 329 return prerendered_tc_set_.count(tc) > 0;
330 } 330 }
331 331
332 } // namespace prerender 332 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/possible_url_model.cc ('k') | chrome/browser/profile_import_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698