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

Side by Side Diff: chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc

Issue 6677051: fav icon -> favicon. Pass 8: content/ (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
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/ui/gtk/tabs/tab_renderer_gtk.h" 5 #include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 // will eventually be chromium-themable and this code will go away. 306 // will eventually be chromium-themable and this code will go away.
307 data_.is_default_favicon = 307 data_.is_default_favicon =
308 (data_.favicon.pixelRef() == 308 (data_.favicon.pixelRef() ==
309 ResourceBundle::GetSharedInstance().GetBitmapNamed( 309 ResourceBundle::GetSharedInstance().GetBitmapNamed(
310 IDR_DEFAULT_FAVICON)->pixelRef()); 310 IDR_DEFAULT_FAVICON)->pixelRef());
311 } 311 }
312 312
313 // Loading state also involves whether we show the favicon, since that's where 313 // Loading state also involves whether we show the favicon, since that's where
314 // we display the throbber. 314 // we display the throbber.
315 data_.loading = contents->is_loading(); 315 data_.loading = contents->is_loading();
316 data_.show_icon = contents->ShouldDisplayFavIcon(); 316 data_.show_icon = contents->ShouldDisplayFavicon();
317 } 317 }
318 318
319 void TabRendererGtk::UpdateFromModel() { 319 void TabRendererGtk::UpdateFromModel() {
320 // Force a layout, since the tab may have grown a favicon. 320 // Force a layout, since the tab may have grown a favicon.
321 Layout(); 321 Layout();
322 SchedulePaint(); 322 SchedulePaint();
323 323
324 if (data_.crashed) { 324 if (data_.crashed) {
325 if (!should_display_crashed_favicon_ && !IsPerformingCrashAnimation()) 325 if (!should_display_crashed_favicon_ && !IsPerformingCrashAnimation())
326 StartCrashAnimation(); 326 StartCrashAnimation();
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 1080
1081 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 1081 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
1082 const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont); 1082 const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
1083 title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize); 1083 title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
1084 title_font_height_ = title_font_->GetHeight(); 1084 title_font_height_ = title_font_->GetHeight();
1085 1085
1086 crashed_favicon = rb.GetBitmapNamed(IDR_SAD_FAVICON); 1086 crashed_favicon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
1087 1087
1088 initialized_ = true; 1088 initialized_ = true;
1089 } 1089 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698