Renaming TabRendererData::off_the_record to TabRendererData::incognito

BUG=3333
TEST=NONE


Review URL: http://codereview.chromium.org/6681026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78140 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 6 insertions, 8 deletions

diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 6cda90a..ab64ce4 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -394,7 +394,7 @@ void BrowserTabStripController::SetTabRendererDataFromModel(
   data->title = contents->GetTitle();
   data->loading = contents->is_loading();
   data->crashed_status = contents->crashed_status();
-  data->off_the_record = contents->profile()->IsOffTheRecord();
+  data->incognito = contents->profile()->IsOffTheRecord();
   data->show_icon = contents->ShouldDisplayFavIcon();
   data->mini = model_->IsMiniTab(model_index);
   data->blocked = model_->IsTabBlocked(model_index);
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index ad9937a9..280e71c 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -436,8 +436,6 @@ void Tab::PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas) {
 }
 
 void Tab::PaintInactiveTabBackground(gfx::Canvas* canvas) {
-  bool is_otr = data().off_the_record;
-
   // The tab image needs to be lined up with the background image
   // so that it feels partially transparent.  These offsets represent the tab
   // position within the frame background image.
@@ -448,8 +446,8 @@ void Tab::PaintInactiveTabBackground(gfx::Canvas* canvas) {
       GetWidget()->GetWindow()->non_client_view()->UseNativeFrame()) {
     tab_id = IDR_THEME_TAB_BACKGROUND_V;
   } else {
-    tab_id = is_otr ? IDR_THEME_TAB_BACKGROUND_INCOGNITO :
-                      IDR_THEME_TAB_BACKGROUND;
+    tab_id = data().incognito ? IDR_THEME_TAB_BACKGROUND_INCOGNITO :
+                                IDR_THEME_TAB_BACKGROUND;
   }
 
   SkBitmap* tab_bg = GetThemeProvider()->GetBitmapNamed(tab_id);
diff --git a/chrome/browser/ui/views/tabs/tab_renderer_data.cc b/chrome/browser/ui/views/tabs/tab_renderer_data.cc
index fae7114..00cd8a2 100644
--- a/chrome/browser/ui/views/tabs/tab_renderer_data.cc
+++ b/chrome/browser/ui/views/tabs/tab_renderer_data.cc
@@ -9,7 +9,7 @@ TabRendererData::TabRendererData()
       common_prefix_length(0),
       loading(false),
       crashed_status(base::TERMINATION_STATUS_STILL_RUNNING),
-      off_the_record(false),
+      incognito(false),
       show_icon(true),
       mini(false),
       blocked(false),
@@ -28,7 +28,7 @@ bool TabRendererData::Equals(const TabRendererData& data) {
       common_prefix_length == data.common_prefix_length &&
       loading == data.loading &&
       crashed_status == data.crashed_status &&
-      off_the_record == data.off_the_record &&
+      incognito == data.incognito &&
       show_icon == data.show_icon &&
       mini == data.mini &&
       blocked == data.blocked &&
diff --git a/chrome/browser/ui/views/tabs/tab_renderer_data.h b/chrome/browser/ui/views/tabs/tab_renderer_data.h
index 49af30a..3690b4f 100644
--- a/chrome/browser/ui/views/tabs/tab_renderer_data.h
+++ b/chrome/browser/ui/views/tabs/tab_renderer_data.h
@@ -45,7 +45,7 @@ struct TabRendererData {
   size_t common_prefix_length;
   bool loading;
   base::TerminationStatus crashed_status;
-  bool off_the_record;
+  bool incognito;
   bool show_icon;
   bool mini;
   bool blocked;