(Views only) Disable drop-down buttons in the website settings popup for managed permissions

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

Index: chrome/browser/ui/views/website_settings/permission_selector_view.cc
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
index 3bb4cc9a2a765cad97551ada7dfbc37085cbfb2e..8878e4f36331b9ad7280e6ba4ebbe58dfddb2420 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc
+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
@@ -91,7 +91,8 @@ class PermissionMenuButton : public views::MenuButton,
   // of the |model| remains with the caller and is not transfered to the
   // |PermissionMenuButton|.
   PermissionMenuButton(const string16& text,
-                       PermissionMenuModel* model);
+                       PermissionMenuModel* model,
+                       bool show_menu_marker);

[Finnur, 2012/08/03 08:16:48]

Document the new parameter.

[markusheintz_, 2012/08/03 10:52:49]

Done.

   virtual ~PermissionMenuButton();
 
   // Overridden from views::MenuButton.
@@ -168,8 +169,10 @@ void PermissionMenuModel::ExecuteCommand(int command_id) {
 ///////////////////////////////////////////////////////////////////////////////
 
 PermissionMenuButton::PermissionMenuButton(const string16& text,
-                                           PermissionMenuModel* model)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(MenuButton(NULL, text, this, true)),
+                                           PermissionMenuModel* model,
+                                           bool show_menu_marker)
+    : ALLOW_THIS_IN_INITIALIZER_LIST(MenuButton(NULL, text, this,
+                                                show_menu_marker)),
       menu_model_(model) {
 }
 
@@ -219,9 +222,11 @@ void PermissionMenuButton::OnMenuButtonClicked(View* source,
 // PermissionSelectorView
 ///////////////////////////////////////////////////////////////////////////////
 
-PermissionSelectorView::PermissionSelectorView(ContentSettingsType type,
-                                               ContentSetting default_setting,
-                                               ContentSetting current_setting)
+PermissionSelectorView::PermissionSelectorView(
+    ContentSettingsType type,
+    ContentSetting default_setting,
+    ContentSetting current_setting,
+    content_settings::SettingSource source)
     : icon_(NULL),
       menu_button_(NULL) {
   views::GridLayout* layout = new views::GridLayout(this);
@@ -274,10 +279,14 @@ PermissionSelectorView::PermissionSelectorView(ContentSettingsType type,
   // Create the permission menu button.
   menu_button_model_.reset(new internal::PermissionMenuModel(
       type, default_setting, current_setting, this));
+  bool button_enabled = source == content_settings::SETTING_SOURCE_USER;
   menu_button_ = new internal::PermissionMenuButton(
       WebsiteSettingsUI::PermissionActionToUIString(current_setting,
-                                                    default_setting),
-      menu_button_model_.get());
+                                                    default_setting,
+                                                    source),
+      menu_button_model_.get(),
+      button_enabled);
+  menu_button_->SetEnabled(button_enabled);
   layout->AddView(menu_button_);
 }
 
@@ -298,7 +307,9 @@ void PermissionSelectorView::SelectionChanged() {
   // Update the menu button text to reflect the new setting.
   menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString(
         menu_button_model_->current_setting(),
-        menu_button_model_->default_setting()));
+        menu_button_model_->default_setting(),
+        content_settings::SETTING_SOURCE_USER));
+
 
   FOR_EACH_OBSERVER(PermissionSelectorViewObserver,
                     observer_list_,