Removing 'off the record' references from TabRendererGtk. Contributed by vipul.bhasin@gmail.com

chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/utf_string_conversions.h"
@@ skipping 271 matching lines @@
 }
 
 void TabRendererGtk::UpdateData(TabContents* contents,
                                 bool app,
                                 bool loading_only) {
   DCHECK(contents);
   theme_provider_ = GtkThemeProvider::GetFrom(contents->profile());
 
   if (!loading_only) {
     data_.title = contents->GetTitle();
-    data_.off_the_record = contents->profile()->IsOffTheRecord();
+    data_.incognito = contents->profile()->IsOffTheRecord();
     data_.crashed = contents->is_crashed();
 
     SkBitmap* app_icon = contents->GetExtensionAppIcon();
     if (app_icon)
       data_.favicon = *app_icon;
     else
       data_.favicon = contents->GetFavIcon();
 
     data_.app = app;
     // This is kind of a hacky way to determine whether our icon is the default
@@ skipping 76 matching lines @@
   // The actual paint methods expect 0, 0 to be the tab top left (see
   // PaintTab).
   canvas.TranslateInt(x(), y());
 
   // Paint the background behind the favicon.
   int theme_id;
   int offset_y = 0;
   if (IsSelected()) {
     theme_id = IDR_THEME_TOOLBAR;
   } else {
-    if (!data_.off_the_record) {
+    if (!data_.incognito) {
       theme_id = IDR_THEME_TAB_BACKGROUND;
     } else {
       theme_id = IDR_THEME_TAB_BACKGROUND_INCOGNITO;
     }
     if (!theme_provider_->HasCustomImage(theme_id))
       offset_y = background_offset_y_;
   }
   SkBitmap* tab_bg = theme_provider_->GetBitmapNamed(theme_id);
   canvas.TileImageInt(*tab_bg,
       x() + favicon_bounds_.x(), offset_y + favicon_bounds_.y(),
@@ skipping 482 matching lines @@
                              gfx::Rect(width(), height()));
       canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255,
                                        SkXfermode::kClear_Mode);
       PaintActiveTabBackground(canvas);
       canvas->Restore();
     }
   }
 }
 
 void TabRendererGtk::PaintInactiveTabBackground(gfx::Canvas* canvas) {
-  bool is_otr = data_.off_the_record;
+  bool is_incognito = data_.incognito;

[msw, 2011/03/12 19:45:55]

You may as well remove this local bool, and use |data_.incognito| directly
below.

 
   // The tab image needs to be lined up with the background image
   // so that it feels partially transparent.
   int offset_x = background_offset_x_;
 
-  int tab_id = is_otr ?
+  int tab_id = is_incognito ?
       IDR_THEME_TAB_BACKGROUND_INCOGNITO : IDR_THEME_TAB_BACKGROUND;
 
   SkBitmap* tab_bg = theme_provider_->GetBitmapNamed(tab_id);
 
   // If the theme is providing a custom background image, then its top edge
   // should be at the top of the tab. Otherwise, we assume that the background
   // image is a composited foreground + frame image.
   int offset_y = theme_provider_->HasCustomImage(tab_id) ?
       0 : background_offset_y_;
 
@@ skipping 172 matching lines @@
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
   title_font_height_ = title_font_->GetHeight();
 
   crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
   initialized_ = true;
 }