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

Unified Diff: chrome/browser/gtk/tabs/tab_renderer_gtk.cc

Issue 179028: Revert "Fix a ton of compiler warnings." (Closed)
Patch Set: Created 11 years, 4 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/browser/gtk/tabs/tab_gtk.h ('k') | chrome/browser/gtk/view_id_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/tabs/tab_renderer_gtk.cc
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
index 867d92451583579227b9ebcf0a2bf9184a55f22f..6a60e2b060b206d3019d35ae1155533f02b4af48 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
@@ -236,9 +236,7 @@ TabRendererGtk::TabRendererGtk(ThemeProvider* theme_provider)
fav_icon_hiding_offset_(0),
should_display_crashed_favicon_(false),
loading_animation_(theme_provider),
- // Zero is not a valid SkColor. It'll be replaced by the
- // theme tab_text_color.
- close_button_color_(0u) {
+ close_button_color_(NULL) {
InitResources();
data_.pinned = false;
@@ -592,7 +590,7 @@ void TabRendererGtk::Layout() {
if (theme_provider_) {
SkColor tab_text_color =
theme_provider_->GetColor(BrowserThemeProvider::COLOR_TAB_TEXT);
- if (close_button_color_ == 0u || tab_text_color != close_button_color_) {
+ if (!close_button_color_ || tab_text_color != close_button_color_) {
close_button_color_ = tab_text_color;
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
close_button_->SetBackground(close_button_color_,
« no previous file with comments | « chrome/browser/gtk/tabs/tab_gtk.h ('k') | chrome/browser/gtk/view_id_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698