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

chrome/browser/geolocation/geolocation_content_settings_map.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.
 
 // Implementation of the geolocation content settings map. Styled on
 // HostContentSettingsMap however unlike that class, this one does not hold
 // an additional in-memory copy of the settings as it does not need to support
 // thread safe synchronous access to the settings; all geolocation permissions
 // are read and written in the UI thread. (If in future this is no longer the
 // case, refer to http://codereview.chromium.org/1525018 for a previous version
 // with caching. Note that as we must observe the prefs store for settings
 // changes, e.g. coming from the sync engine, the simplest design would be to
 // always write-through changes straight to the prefs store, and rely on the
 // notification observer to subsequently update any cached copy).
 
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 
 #include <string>
 
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
 #include "chrome/browser/content_settings/content_settings_pattern.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/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "net/base/dns_util.h"
 #include "net/base/static_cookie_policy.h"
 
 // static
 const ContentSetting
     GeolocationContentSettingsMap::kDefaultSetting = CONTENT_SETTING_ASK;
 
 GeolocationContentSettingsMap::GeolocationContentSettingsMap(Profile* profile)
     : profile_(profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   prefs_registrar_.Init(profile_->GetPrefs());
   prefs_registrar_.Add(prefs::kGeolocationDefaultContentSetting, this);
   prefs_registrar_.Add(prefs::kGeolocationContentSettings, this);
-  notification_registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
+  notification_registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                               Source<Profile>(profile_));
 }
 
 // static
 void GeolocationContentSettingsMap::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kGeolocationDefaultContentSetting,
                              CONTENT_SETTING_ASK,
                              PrefService::SYNCABLE_PREF);
   prefs->RegisterDictionaryPref(prefs::kGeolocationContentSettings,
                                 PrefService::SYNCABLE_PREF);
@@ skipping 135 matching lines @@
   if (!profile_)
     return;
   PrefService* prefs = profile_->GetPrefs();
   prefs->ClearPref(prefs::kGeolocationDefaultContentSetting);
   prefs->ClearPref(prefs::kGeolocationContentSettings);
 }
 
 void GeolocationContentSettingsMap::NotifyObservers(
     const ContentSettingsDetails& details) {
   NotificationService::current()->Notify(
-      NotificationType::GEOLOCATION_SETTINGS_CHANGED,
+      chrome::NOTIFICATION_GEOLOCATION_SETTINGS_CHANGED,
       Source<GeolocationContentSettingsMap>(this),
       Details<const ContentSettingsDetails>(&details));
 }
 
 void GeolocationContentSettingsMap::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  if (type == NotificationType::PREF_CHANGED) {
+  if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     const std::string& name = *Details<std::string>(details).ptr();
     if (name == prefs::kGeolocationDefaultContentSetting) {
       ContentSettingsDetails details(ContentSettingsPattern(),
                                      ContentSettingsPattern(),
                                      CONTENT_SETTINGS_TYPE_DEFAULT,
                                      std::string());
       NotifyObservers(details);
     }
-  } else if (NotificationType::PROFILE_DESTROYED == type) {
+  } else if (chrome::NOTIFICATION_PROFILE_DESTROYED == type) {
     UnregisterObservers();
   } else {
     NOTREACHED();
   }
 }
 
 void GeolocationContentSettingsMap::UnregisterObservers() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!profile_)
     return;
   prefs_registrar_.RemoveAll();
-  notification_registrar_.Remove(this, NotificationType::PROFILE_DESTROYED,
+  notification_registrar_.Remove(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                                  Source<Profile>(profile_));
   profile_ = NULL;
 }
 
 GeolocationContentSettingsMap::~GeolocationContentSettingsMap() {
   UnregisterObservers();
 }
 
 // static
 void GeolocationContentSettingsMap::GetOneOriginSettingsFromDictionary(
     const DictionaryValue* dictionary,
     OneOriginSettings* one_origin_settings) {
   for (DictionaryValue::key_iterator i(dictionary->begin_keys());
        i != dictionary->end_keys(); ++i) {
     const std::string& target(*i);
     int setting = kDefaultSetting;
     bool found = dictionary->GetIntegerWithoutPathExpansion(target, &setting);
     DCHECK(found);
     GURL target_url(target);
     // An empty URL has a special meaning (wildcard), so only accept invalid
     // URLs if the original version was empty (avoids treating corrupted prefs
     // as the wildcard entry; see http://crbug.com/39685)
     if (target_url.is_valid() || target.empty())
       (*one_origin_settings)[target_url] = IntToContentSetting(setting);
   }
 }