Address Finnur's review comments (variable names and comments) that were...

chrome/browser/views/options/content_settings_window_view.cc

 // Copyright (c) 2010 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/views/options/content_settings_window_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 100 matching lines @@
     views::Listbox* sender) {
   DCHECK_EQ(listbox_, sender);
   ShowSettingsPage(listbox_->SelectedRow());
   last_selected_page_.SetValue(current_page_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ContentSettingsWindowView, views::View overrides:
 
 void ContentSettingsWindowView::Layout() {
-  int list_box_width = views::Window::GetLocalizedContentsWidth(
+  int listbox_width = views::Window::GetLocalizedContentsWidth(
       IDS_CONTENT_SETTINGS_DIALOG_LISTBOX_WIDTH_CHARS);
   label_->SetBounds(kDialogPadding,
                     kDialogPadding,
-                    list_box_width,
+                    listbox_width,
                     label_->GetPreferredSize().height());
 
   listbox_->SetBounds(kDialogPadding,
                       2 * kDialogPadding + label_->height(),
-                      list_box_width,
+                      listbox_width,
                       height() - (3 * kDialogPadding) - label_->height());
 
   if (pages_[current_page_]->GetParent()) {
     pages_[current_page_]->SetBounds(
-        2 * kDialogPadding + list_box_width,
+        2 * kDialogPadding + listbox_width,
         2 * kDialogPadding + label_->height(),
-        width() - (3 * kDialogPadding) - list_box_width,
+        width() - (3 * kDialogPadding) - listbox_width,
         height() - (2 * kDialogPadding));
   }
 }
 
 gfx::Size ContentSettingsWindowView::GetPreferredSize() {
   return gfx::Size(views::Window::GetLocalizedContentsSize(
       IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS,
       IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES));
 }
 
@@ skipping 54 matching lines @@
   current_page_ = page;
   AddChildView(pages_[current_page_]);
   Layout();
   SchedulePaint();
 }
 
 const OptionsPageView*
     ContentSettingsWindowView::GetCurrentContentSettingsTabView() const {
   return static_cast<OptionsPageView*>(pages_[current_page_]);
 }