Material Page Info (Views, 1/3): Rename {ChosenObject, PermissionSelector}View classes to {...}Row.

chrome/browser/ui/views/website_settings/permission_selector_row.cc

Index: chrome/browser/ui/views/website_settings/permission_selector_row.cc
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_row.cc
similarity index 85%
rename from chrome/browser/ui/views/website_settings/permission_selector_view.cc
rename to chrome/browser/ui/views/website_settings/permission_selector_row.cc
index 8a78c343a82ba22f43d4cdb8f8a3df98d3840f8c..a6fcc9a823c832198b2ab9cb258cb72963670f21 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc
+++ b/chrome/browser/ui/views/website_settings/permission_selector_row.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
+#include "chrome/browser/ui/views/website_settings/permission_selector_row.h"
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
@@ -53,7 +53,7 @@ class PermissionMenuButton : public views::MenuButton,
                            const gfx::Point& point,
                            const ui::Event* event) override;
 
-  PermissionMenuModel* menu_model_;  // Owned by |PermissionSelectorView|.
+  PermissionMenuModel* menu_model_;  // Owned by |PermissionSelectorRow|.
   std::unique_ptr<views::MenuRunner> menu_runner_;
 
   bool is_rtl_display_;
@@ -81,8 +81,7 @@ PermissionMenuButton::PermissionMenuButton(const base::string16& text,
       base::i18n::RIGHT_TO_LEFT == base::i18n::GetStringDirection(text);
 }
 
-PermissionMenuButton::~PermissionMenuButton() {
-}
+PermissionMenuButton::~PermissionMenuButton() {}
 
 void PermissionMenuButton::GetAccessibleState(ui::AXViewState* state) {
   MenuButton::GetAccessibleState(state);
@@ -90,12 +89,15 @@ void PermissionMenuButton::GetAccessibleState(ui::AXViewState* state) {
 }
 
 void PermissionMenuButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
-  SetTextColor(views::Button::STATE_NORMAL, theme->GetSystemColor(
-      ui::NativeTheme::kColorId_LabelEnabledColor));
-  SetTextColor(views::Button::STATE_HOVERED, theme->GetSystemColor(
-      ui::NativeTheme::kColorId_LabelEnabledColor));
-  SetTextColor(views::Button::STATE_DISABLED, theme->GetSystemColor(
-      ui::NativeTheme::kColorId_LabelDisabledColor));
+  SetTextColor(
+      views::Button::STATE_NORMAL,
+      theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor));
+  SetTextColor(
+      views::Button::STATE_HOVERED,
+      theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor));
+  SetTextColor(
+      views::Button::STATE_DISABLED,
+      theme->GetSystemColor(ui::NativeTheme::kColorId_LabelDisabledColor));
 }
 
 void PermissionMenuButton::OnMenuButtonClicked(views::MenuButton* source,
@@ -223,10 +225,10 @@ void PermissionCombobox::OnPerformAction(Combobox* combobox) {
 }  // namespace internal
 
 ///////////////////////////////////////////////////////////////////////////////
-// PermissionSelectorView
+// PermissionSelectorRow
 ///////////////////////////////////////////////////////////////////////////////
 
-PermissionSelectorView::PermissionSelectorView(
+PermissionSelectorRow::PermissionSelectorRow(
     const GURL& url,
     const WebsiteSettingsUI::PermissionInfo& permission)
     : icon_(NULL), menu_button_(NULL), combobox_(NULL) {
@@ -234,53 +236,34 @@ PermissionSelectorView::PermissionSelectorView(
   SetLayoutManager(layout);
   const int column_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_set_id);
-  column_set->AddColumn(views::GridLayout::FILL,
-                        views::GridLayout::FILL,
-                        1,
-                        views::GridLayout::FIXED,
-                        kPermissionIconColumnWidth,
+  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                        views::GridLayout::FIXED, kPermissionIconColumnWidth,
                         0);
   column_set->AddPaddingColumn(0, kPermissionIconMarginLeft);
-  column_set->AddColumn(views::GridLayout::FILL,
-                        views::GridLayout::FILL,
-                        1,
-                        views::GridLayout::USE_PREF,
-                        0,
-                        0);
-  column_set->AddColumn(views::GridLayout::FILL,
-                        views::GridLayout::FILL,
-                        1,
-                        views::GridLayout::USE_PREF,
-                        0,
-                        0);
+  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                        views::GridLayout::USE_PREF, 0, 0);
+  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                        views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(1, column_set_id);
   // Create the permission icon.
   icon_ = new views::ImageView();
   const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(permission);
   icon_->SetImage(image.ToImageSkia());
-  layout->AddView(icon_,
-                  1,
-                  1,
-                  views::GridLayout::CENTER,
+  layout->AddView(icon_, 1, 1, views::GridLayout::CENTER,
                   views::GridLayout::CENTER);
   // Create the label that displays the permission type.
   views::Label* label = new views::Label(l10n_util::GetStringFUTF16(
       IDS_WEBSITE_SETTINGS_PERMISSION_TYPE,
       WebsiteSettingsUI::PermissionTypeToUIString(permission.type)));
-  layout->AddView(label,
-                  1,
-                  1,
-                  views::GridLayout::LEADING,
+  layout->AddView(label, 1, 1, views::GridLayout::LEADING,
                   views::GridLayout::CENTER);
   // Create the menu model.
   menu_model_.reset(new PermissionMenuModel(
-      url,
-      permission,
-      base::Bind(&PermissionSelectorView::PermissionChanged,
-                 base::Unretained(this))));
+      url, permission, base::Bind(&PermissionSelectorRow::PermissionChanged,
+                                  base::Unretained(this))));
 
-  // Create the permission menu button.
+// Create the permission menu button.
 #if defined(OS_MACOSX)
   bool use_real_combobox = true;
 #else
@@ -293,12 +276,12 @@ PermissionSelectorView::PermissionSelectorView(
     InitializeMenuButtonView(layout, permission);
 }
 
-void PermissionSelectorView::AddObserver(
-    PermissionSelectorViewObserver* observer) {
+void PermissionSelectorRow::AddObserver(
+    PermissionSelectorRowObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
-void PermissionSelectorView::ChildPreferredSizeChanged(View* child) {
+void PermissionSelectorRow::ChildPreferredSizeChanged(View* child) {
   SizeToPreferredSize();
   // FIXME: The parent is only a plain |View| that is used as a
   // container/box/panel. The SizeToPreferredSize method of the parent is
@@ -307,10 +290,10 @@ void PermissionSelectorView::ChildPreferredSizeChanged(View* child) {
   parent()->SizeToPreferredSize();
 }
 
-PermissionSelectorView::~PermissionSelectorView() {
+PermissionSelectorRow::~PermissionSelectorRow() {
   // Gross. On paper the Combobox and the ComboboxModelAdapter are both owned by
   // this class, but actually, the Combobox is owned by View and will be
-  // destroyed in ~View(), which runs *after* ~PermissionSelectorView() is done,
+  // destroyed in ~View(), which runs *after* ~PermissionSelectorRow() is done,
   // which means the Combobox gets destroyed after its ComboboxModel, which
   // causes an explosion when the Combobox attempts to stop observing the
   // ComboboxModel. This hack ensures the Combobox is deleted before its
@@ -322,7 +305,7 @@ PermissionSelectorView::~PermissionSelectorView() {
     RemoveChildView(combobox_);
 }
 
-void PermissionSelectorView::InitializeMenuButtonView(
+void PermissionSelectorRow::InitializeMenuButtonView(
     views::GridLayout* layout,
     const WebsiteSettingsUI::PermissionInfo& permission) {
   bool button_enabled =
@@ -338,7 +321,7 @@ void PermissionSelectorView::InitializeMenuButtonView(
   layout->AddView(menu_button_);
 }
 
-void PermissionSelectorView::InitializeComboboxView(
+void PermissionSelectorRow::InitializeComboboxView(
     views::GridLayout* layout,
     const WebsiteSettingsUI::PermissionInfo& permission) {
   bool button_enabled =
@@ -349,15 +332,14 @@ void PermissionSelectorView::InitializeComboboxView(
       WebsiteSettingsUI::PermissionActionToUIString(
           permission.type, permission.setting, permission.default_setting,
           permission.source),
-      combobox_model_adapter_.get(), button_enabled,
-      true);
+      combobox_model_adapter_.get(), button_enabled, true);
   combobox_->SetEnabled(button_enabled);
   combobox_->SetAccessibleName(
       WebsiteSettingsUI::PermissionTypeToUIString(permission.type));
   layout->AddView(combobox_);
 }
 
-void PermissionSelectorView::PermissionChanged(
+void PermissionSelectorRow::PermissionChanged(
     const WebsiteSettingsUI::PermissionInfo& permission) {
   // Change the permission icon to reflect the selected setting.
   const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(permission);
@@ -374,7 +356,6 @@ void PermissionSelectorView::PermissionChanged(
     combobox_->UpdateSelectedIndex(use_default);
   }
 
-  FOR_EACH_OBSERVER(PermissionSelectorViewObserver,
-                    observer_list_,
+  FOR_EACH_OBSERVER(PermissionSelectorRowObserver, observer_list_,

[felt, 2016/09/06 20:03:53]

(is this change just a result of running git cl format?)

[lgarron, 2016/09/07 06:55:26]

(Ditto.)

                     OnPermissionChanged(permission));
 }