Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/bookmarks/bookmark_storage.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/bookmarks/bookmark_storage.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/json_value_serializer.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 
 using base::TimeTicks;
 
 namespace {
 
 // Extension used for backup files (copy of main file created during startup).
 const FilePath::CharType kBackupExtension[] = FILE_PATH_LITERAL("bak");
 
 // How often we save.
 const int kSaveDelayMS = 2500;
@@ skipping 137 matching lines @@
   HistoryService* history =
       profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   if (!history) {
     // This happens in unit tests.
     if (model_)
       model_->DoneLoading(details_.release());
     return;
   }
   if (!history->BackendLoaded()) {
     // The backend isn't finished loading. Wait for it.
-    notification_registrar_.Add(this, NotificationType::HISTORY_LOADED,
+    notification_registrar_.Add(this, chrome::NOTIFICATION_HISTORY_LOADED,
                                 Source<Profile>(profile_));
   } else {
     DoLoadBookmarks(tmp_history_path_);
   }
 }
 
 void BookmarkStorage::OnHistoryFinishedWriting() {
-  notification_registrar_.Remove(this, NotificationType::HISTORY_LOADED,
+  notification_registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_LOADED,
                                  Source<Profile>(profile_));
 
   // This is used when migrating bookmarks data from database to file.
   // History wrote the file for us, and now we want to load data from it.
   DoLoadBookmarks(tmp_history_path_);
 }
 
 void BookmarkStorage::ScheduleSave() {
   writer_.ScheduleWrite(this);
 }
@@ skipping 38 matching lines @@
 
     // Clean up after migration from history.
     base::FileUtilProxy::Delete(
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
         tmp_history_path_,
         false,
         NULL);
   }
 }
 
-void BookmarkStorage::Observe(NotificationType type,
+void BookmarkStorage::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::HISTORY_LOADED:
+  switch (type) {
+    case chrome::NOTIFICATION_HISTORY_LOADED:
       OnHistoryFinishedWriting();
       break;
 
     default:
       NOTREACHED();
       break;
   }
 }
 
 bool BookmarkStorage::SaveNow() {
   if (!model_ || !model_->IsLoaded()) {
     // We should only get here if we have a valid model and it's finished
     // loading.
     NOTREACHED();
     return false;
   }
 
   std::string data;
   if (!SerializeData(&data))
     return false;
   writer_.WriteNow(data);
   return true;
 }