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

Unified Diff: chrome/browser/views/tabs/base_tab.cc

Issue 3071002: Remove code to handle bogus themes. We've had a theming system for a while a... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/tabs/base_tab.cc
===================================================================
--- chrome/browser/views/tabs/base_tab.cc (revision 53545)
+++ chrome/browser/views/tabs/base_tab.cc (working copy)
@@ -508,27 +508,6 @@
loading_animation_frame_count =
loading_animation_frames->width() / loading_animation_frames->height();
- // We get a DIV0 further down when the throbber is replaced by an image which
- // is taller than wide. In this case we cannot deduce an animation sequence
- // from it since we assume that each animation frame has the width of the
- // image's height.
- if (loading_animation_frame_count == 0) {
-#ifdef WIN32
- // TODO(idanan): Remove this when we have a way to handle theme errors.
- // See: http://code.google.com/p/chromium/issues/detail?id=12531 For now,
- // this is Windows-specific because some users have downloaded a DLL from
- // outside of Google to override the theme.
- std::wstring text = l10n_util::GetString(IDS_RESOURCE_ERROR);
- std::wstring caption = l10n_util::GetString(IDS_RESOURCE_ERROR_CAPTION);
- UINT flags = MB_OK | MB_ICONWARNING | MB_TOPMOST;
- win_util::MessageBox(NULL, text, caption, flags);
-#endif
- CHECK(loading_animation_frame_count) <<
- "Invalid throbber size. Width = " <<
- loading_animation_frames->width() << ", height = " <<
- loading_animation_frames->height();
- }
-
waiting_animation_frames = rb.GetBitmapNamed(IDR_THROBBER_WAITING);
DCHECK(waiting_animation_frames);
DCHECK(waiting_animation_frames->width() %
@@ -538,12 +517,6 @@
waiting_to_loading_frame_count_ratio =
waiting_animation_frame_count / loading_animation_frame_count;
- // TODO(beng): eventually remove this when we have a proper themeing system.
- // themes not supporting IDR_THROBBER_WAITING are causing this
- // value to be 0 which causes DIV0 crashes. The value of 5
- // matches the current bitmaps in our source.
- if (waiting_to_loading_frame_count_ratio == 0)
- waiting_to_loading_frame_count_ratio = 5;
font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont));
font_height_ = font_->height();
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698