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

chrome/browser/autocomplete/shortcuts_provider.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/autocomplete/shortcuts_provider.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 #include <vector>
 
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "googleurl/src/url_parse.h"
 #include "googleurl/src/url_util.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 
 namespace {
 // Adds match at the end if and only if its style is different from the last
 // match.
 void AddLastMatchIfNeeded(ACMatchClassifications* matches,
                           int position,
@@ skipping 34 matching lines @@
 
 // A match needs to score at least 1200 to be default, so set the max below
 // this. For ease of unit testing, make it divisible by 4 (since some tests
 // check for half or quarter of the max score).
 const int ShortcutsProvider::kMaxScore = 1196;
 
 ShortcutsProvider::ShortcutsProvider(ACProviderListener* listener,
                                      Profile* profile)
     : AutocompleteProvider(listener, profile, "ShortcutsProvider"),
       languages_(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)) {
-  notification_registrar_.Add(this, NotificationType::OMNIBOX_OPENED_URL,
+  notification_registrar_.Add(this, chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
                               Source<Profile>(profile));
-  notification_registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
+  notification_registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
                               Source<Profile>(profile));
 }
 
 ShortcutsProvider::~ShortcutsProvider() {
 }
 
 void ShortcutsProvider::Start(const AutocompleteInput& input,
                               bool minimal_changes) {
   matches_.clear();
 
@@ skipping 25 matching lines @@
 
   // Delete the match from the history DB. This will eventually result in a
   // second call to DeleteShortcutsWithURLs(), which is harmless.
   HistoryService* const history_service =
       profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
 
   DCHECK(history_service && match.destination_url.is_valid());
   history_service->DeleteURL(match.destination_url);
 }
 
-void ShortcutsProvider::Observe(NotificationType type,
+void ShortcutsProvider::Observe(int type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
-  if (type == NotificationType::HISTORY_URLS_DELETED) {
+  if (type == chrome::NOTIFICATION_HISTORY_URLS_DELETED) {
     const std::set<GURL>& urls =
         Details<const history::URLsDeletedDetails>(details)->urls;
     DeleteShortcutsWithURLs(urls);
     return;
   }
 
-  DCHECK(type == NotificationType::OMNIBOX_OPENED_URL);
+  DCHECK(type == chrome::NOTIFICATION_OMNIBOX_OPENED_URL);
 
   AutocompleteLog* log = Details<AutocompleteLog>(details).ptr();
   string16 text_lowercase(base::i18n::ToLower(log->text));
 
   int number_of_hits = 1;
   const AutocompleteMatch& match(log->result.match_at(log->selected_index));
   for (ShortcutMap::iterator it = FindFirstMatch(text_lowercase);
        it != shortcuts_map_.end() &&
            StartsWith(it->first, text_lowercase, true); ++it) {
     if (match.destination_url == it->second.url) {
@@ skipping 240 matching lines @@
   StripMatchMarkersFromClassifications(&description_class);
 }
 
 ShortcutsProvider::Shortcut::Shortcut()
     : last_access_time(base::Time::Now()),
       number_of_hits(0) {
 }
 
 ShortcutsProvider::Shortcut::~Shortcut() {
 }