Fix broken threading model in CheckDesktopNotificationPermission

chrome/browser/extensions/extension_info_map.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/extensions/extension_info_map.h"
 
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/incognito_handler.h"
 #include "chrome/common/url_constants.h"
@@ skipping 12 matching lines @@
 
 }  // namespace
 
 struct ExtensionInfoMap::ExtraData {
   // When the extension was installed.
   base::Time install_time;
 
   // True if the user has allowed this extension to run in incognito mode.
   bool incognito_enabled;
 
+  // True if the user has disabled notifications for this extension manually.
+  bool notifications_disabled;
+
   ExtraData();
   ~ExtraData();
 };
 
 ExtensionInfoMap::ExtraData::ExtraData() : incognito_enabled(false) {}
 
 ExtensionInfoMap::ExtraData::~ExtraData() {}
 
 ExtensionInfoMap::ExtensionInfoMap() : signin_process_id_(-1) {}
 
 const extensions::ProcessMap& ExtensionInfoMap::process_map() const {
   return process_map_;
 }
 
 void ExtensionInfoMap::AddExtension(const Extension* extension,
                                     base::Time install_time,
-                                    bool incognito_enabled) {
+                                    bool incognito_enabled,
+                                    bool notifications_disabled) {
   CheckOnValidThread();
   extensions_.Insert(extension);
   disabled_extensions_.Remove(extension->id());
 
   extra_data_[extension->id()].install_time = install_time;
   extra_data_[extension->id()].incognito_enabled = incognito_enabled;
+  extra_data_[extension->id()].notifications_disabled = notifications_disabled;
 }
 
 void ExtensionInfoMap::RemoveExtension(
     const std::string& extension_id,
     const UnloadedExtensionInfo::Reason reason) {
   CheckOnValidThread();
   const Extension* extension = extensions_.GetByID(extension_id);
   extra_data_.erase(extension_id);  // we don't care about disabled extra data
   bool was_uninstalled = (reason != UnloadedExtensionInfo::REASON_DISABLE &&
                           reason != UnloadedExtensionInfo::REASON_TERMINATE);
@@ skipping 104 matching lines @@
 }
 
 void ExtensionInfoMap::SetSigninProcess(int process_id) {
   signin_process_id_ = process_id;
 }
 
 bool ExtensionInfoMap::IsSigninProcess(int process_id) const {
   return process_id == signin_process_id_;
 }
 
+void ExtensionInfoMap::SetNotificationsDisabled(
+    const std::string& extension_id,
+    bool notifications_disabled) {
+  ExtraDataMap::iterator iter = extra_data_.find(extension_id);
+  if (iter != extra_data_.end())
+    iter->second.notifications_disabled = notifications_disabled;
+}
+
+bool ExtensionInfoMap::GetNotificationsDisabledForExtension(
+    const std::string& extension_id) const {
+  ExtraDataMap::const_iterator iter = extra_data_.find(extension_id);
+  if (iter != extra_data_.end())
+    return iter->second.notifications_disabled;
+  return false;
+}
+
 ExtensionInfoMap::~ExtensionInfoMap() {
   if (quota_service_) {
     BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE,
                               quota_service_.release());
   }
 }