Disable Web Notifications in Incognito

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

 // Copyright (c) 2012 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/views/website_settings/permission_selector_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/content_settings/core/browser/content_settings_info.h"
+#include "components/content_settings/core/browser/content_settings_registry.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 94 matching lines @@
 }
 
 }  // namespace internal
 
 ///////////////////////////////////////////////////////////////////////////////
 // PermissionSelectorView
 ///////////////////////////////////////////////////////////////////////////////
 
 PermissionSelectorView::PermissionSelectorView(
     const GURL& url,
-    const WebsiteSettingsUI::PermissionInfo& permission)
+    const WebsiteSettingsUI::PermissionInfo& permission,
+    bool is_incognito)
     : icon_(NULL), menu_button_(NULL) {
   views::GridLayout* layout = new views::GridLayout(this);
   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,
@@ skipping 33 matching lines @@
                   views::GridLayout::CENTER);
   // Create the menu model.
   menu_model_.reset(new PermissionMenuModel(
       url,
       permission,
       base::Bind(&PermissionSelectorView::PermissionChanged,
                  base::Unretained(this))));
   // Create the permission menu button.
   bool button_enabled =
       permission.source == content_settings::SETTING_SOURCE_USER;
+  if (is_incognito) {
+    const content_settings::ContentSettingsInfo* info =
+        content_settings::ContentSettingsRegistry::GetInstance()->Get(
+            permission.type);
+    if (info &&
+        info->incognito_behavior() == content_settings::ContentSettingsInfo::
+                                          DENY_IN_INCOGNITO_AFTER_DELAY) {

[palmer, 2016/01/11 20:28:08]

Is this the formatting that "git cl format" chose?

[johnme, 2016/01/12 18:04:52]

Yes, I think so. I've refactored this anyway though (and re-run git cl format).
It'll now omit the Allowed entry from the dropdown, rather than disabling it
completely, which seems slightly clearer UI, and allowed me to add the check in
the PermissionMenuModel constructor instead, matching what other permissions do.

+      // This permission is disabled in incognito. Don't let user enable it.
+      button_enabled = false;
+    }
+  }
   menu_button_ = new internal::PermissionMenuButton(
       WebsiteSettingsUI::PermissionActionToUIString(
           permission.type, permission.setting, permission.default_setting,
           permission.source),
       menu_model_.get(), button_enabled);
   menu_button_->SetEnabled(button_enabled);
   menu_button_->SetFocusable(button_enabled);
   menu_button_->SetAccessibleName(
       WebsiteSettingsUI::PermissionTypeToUIString(permission.type));
   layout->AddView(menu_button_);
@@ skipping 25 matching lines @@
   // Update the menu button text to reflect the new setting.
   menu_button_->SetText(WebsiteSettingsUI::PermissionActionToUIString(
       permission.type, permission.setting, permission.default_setting,
       content_settings::SETTING_SOURCE_USER));
   menu_button_->SizeToPreferredSize();
 
   FOR_EACH_OBSERVER(PermissionSelectorViewObserver,
                     observer_list_,
                     OnPermissionChanged(permission));
 }