Profiles: Change bookmark notifications implementation.

chrome/browser/extensions/extension_bookmarks_module.cc

 // Copyright (c) 2011 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_bookmarks_module.h"
 
 #include "base/file_path.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/time_formatting.h"
 #include "base/json/json_writer.h"
@@ skipping 61 matching lines @@
   return default_path.Append(filename);
 }
 
 }  // namespace
 
 void BookmarksFunction::Run() {
   BookmarkModel* model = profile()->GetBookmarkModel();
   if (!model->IsLoaded()) {
     // Bookmarks are not ready yet.  We'll wait.
     registrar_.Add(this, chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED,
-                   Source<Profile>(profile()));
+                   NotificationService::AllBrowserContextsAndSources());
     AddRef();  // Balanced in Observe().
     return;
   }
 
   bool success = RunImpl();
   if (success) {
     NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTENSION_BOOKMARKS_API_INVOKED,
         Source<const Extension>(GetExtension()),
         Details<const BookmarksFunction>(this));
@@ skipping 13 matching lines @@
 bool BookmarksFunction::EditBookmarksEnabled() {
   if (profile_->GetPrefs()->GetBoolean(prefs::kEditBookmarksEnabled))
     return true;
   error_ = keys::kEditBookmarksDisabled;
   return false;
 }
 
 void BookmarksFunction::Observe(int type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED, type);
-  DCHECK_EQ(profile(), Source<Profile>(source).ptr());
+  DCHECK(type == chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED);
+  Profile* source_profile = Source<Profile>(source).ptr();
+  if (!source_profile || !source_profile->IsSameProfile(profile()))
+    return;
+
   DCHECK(profile()->GetBookmarkModel()->IsLoaded());
   Run();
   Release();  // Balanced in Run().
 }
 
 ExtensionBookmarkEventRouter::ExtensionBookmarkEventRouter(
     BookmarkModel* model) : model_(model) {
 }
 
 ExtensionBookmarkEventRouter::~ExtensionBookmarkEventRouter() {
@@ skipping 801 matching lines @@
   SelectFile(SelectFileDialog::SELECT_SAVEAS_FILE);
   return true;
 }
 
 void ExportBookmarksFunction::FileSelected(const FilePath& path,
                                            int index,
                                            void* params) {
   bookmark_html_writer::WriteBookmarks(profile(), path, NULL);
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }