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

chrome/browser/history/top_sites.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/history/top_sites.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/top_sites_backend.h"
 #include "chrome/browser/history/top_sites_cache.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/ntp/most_visited_handler.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/thumbnail_score.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/common/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ skipping 100 matching lines @@
       last_num_urls_changed_(0),
       blacklist_(NULL),
       pinned_urls_(NULL),
       history_state_(HISTORY_LOADING),
       top_sites_state_(TOP_SITES_LOADING),
       loaded_(false) {
   if (!profile_)
     return;
 
   if (NotificationService::current()) {
-    registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
+    registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
                    Source<Profile>(profile_));
-    registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
+    registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                    NotificationService::AllSources());
   }
 
   // We create update objects here to be sure that dictionaries are created
   // in the user preferences.
   DictionaryPrefUpdate(profile_->GetPrefs(),
                        prefs::kNTPMostVisitedURLsBlacklist).Get();
   DictionaryPrefUpdate(profile_->GetPrefs(),
                        prefs::kNTPMostVisitedPinnedURLs).Get();
 
@@ skipping 619 matching lines @@
     const MostVisitedURLList& urls) {
   PendingCallbackSet::const_iterator i;
   for (i = pending_callbacks.begin();
        i != pending_callbacks.end(); ++i) {
     scoped_refptr<CancelableRequest<GetTopSitesCallback> > request = *i;
     if (!request->canceled())
       request->ForwardResult(GetTopSitesCallback::TupleType(urls));
   }
 }
 
-void TopSites::Observe(NotificationType type,
+void TopSites::Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
   if (!loaded_)
     return;
 
-  if (type == NotificationType::HISTORY_URLS_DELETED) {
+  if (type == chrome::NOTIFICATION_HISTORY_URLS_DELETED) {
     Details<history::URLsDeletedDetails> deleted_details(details);
     if (deleted_details->all_history) {
       SetTopSites(MostVisitedURLList());
       backend_->ResetDatabase();
     } else {
       std::set<size_t> indices_to_delete;  // Indices into top_sites_.
       for (std::set<GURL>::iterator i = deleted_details->urls.begin();
            i != deleted_details->urls.end(); ++i) {
         if (cache_->IsKnownURL(*i))
           indices_to_delete.insert(cache_->GetURLIndex(*i));
       }
 
       if (indices_to_delete.empty())
         return;
 
       MostVisitedURLList new_top_sites(cache_->top_sites());
       for (std::set<size_t>::reverse_iterator i = indices_to_delete.rbegin();
            i != indices_to_delete.rend(); i++) {
         size_t index = *i;
         RemovePinnedURL(new_top_sites[index].url);
         new_top_sites.erase(new_top_sites.begin() + index);
       }
       SetTopSites(new_top_sites);
     }
     StartQueryForMostVisited();
-  } else if (type == NotificationType::NAV_ENTRY_COMMITTED) {
+  } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     if (!IsFull()) {
       content::LoadCommittedDetails* load_details =
           Details<content::LoadCommittedDetails>(details).ptr();
       if (!load_details)
         return;
       const GURL& url = load_details->entry->url();
       if (!cache_->IsKnownURL(url) && HistoryService::CanAddURL(url)) {
         // To avoid slamming history we throttle requests when the url updates.
         // To do otherwise negatively impacts perf tests.
         RestartQueryForTopSitesTimer(GetUpdateDelay());
@@ skipping 74 matching lines @@
     // Now that we're loaded we can service the queued up callbacks. Copy them
     // here and service them outside the lock.
     if (!pending_callbacks_.empty()) {
       filtered_urls = thread_safe_cache_->top_sites();
       pending_callbacks.swap(pending_callbacks_);
     }
   }
 
   ProcessPendingCallbacks(pending_callbacks, filtered_urls);
 
-  NotificationService::current()->Notify(NotificationType::TOP_SITES_LOADED,
+  NotificationService::current()->Notify(chrome::NOTIFICATION_TOP_SITES_LOADED,
                                          Source<Profile>(profile_),
                                          Details<TopSites>(this));
 }
 
 void TopSites::ResetThreadSafeCache() {
   base::AutoLock lock(lock_);
   MostVisitedURLList cached;
   ApplyBlacklistAndPinnedURLs(cache_->top_sites(), &cached);
   thread_safe_cache_->SetTopSites(cached);
 }
 
 void TopSites::ResetThreadSafeImageCache() {
   base::AutoLock lock(lock_);
   thread_safe_cache_->SetThumbnails(cache_->images());
   thread_safe_cache_->RemoveUnreferencedThumbnails();
 }
 
 void TopSites::NotifyTopSitesChanged() {
   NotificationService::current()->Notify(
-      NotificationType::TOP_SITES_CHANGED,
+      chrome::NOTIFICATION_TOP_SITES_CHANGED,
       Source<TopSites>(this),
       NotificationService::NoDetails());
 }
 
 void TopSites::RestartQueryForTopSitesTimer(base::TimeDelta delta) {
   if (timer_.IsRunning() && ((timer_start_time_ + timer_.GetCurrentDelay()) <
                              (base::TimeTicks::Now() + delta))) {
     return;
   }
 
@@ skipping 53 matching lines @@
   }
 }
 
 void TopSites::OnTopSitesAvailableFromHistory(
     CancelableRequestProvider::Handle handle,
     MostVisitedURLList pages) {
   SetTopSites(pages);
 
   // Used only in testing.
   NotificationService::current()->Notify(
-      NotificationType::TOP_SITES_UPDATED,
+      chrome::NOTIFICATION_TOP_SITES_UPDATED,
       Source<TopSites>(this),
       Details<CancelableRequestProvider::Handle>(&handle));
 }
 
 }  // namespace history