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

This file lives in chrome\common. The chrome specific notifications start from NOTIFICATION_CONTENT_END
which defines the end of the enum used by content to define notification types. The notificaton_type.h file
in content\common has been renamed to content_notification_types.h

BUG=76698
Review URL: http://codereview.chromium.org/7327007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91972 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 14 insertions, 13 deletions

diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index baf2d03..a672e7a 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/policy/dummy_configuration_policy_provider.h"
 #include "chrome/browser/policy/user_policy_cache.h"
 #include "chrome/browser/policy/user_policy_token_cache.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
@@ -246,7 +247,7 @@ void BrowserPolicyConnector::InitializeUserPolicy(const std::string& user_name,
   if (command_line->HasSwitch(switches::kDeviceManagementUrl)) {
     token_service_ = token_service;
     registrar_.Add(this,
-                   NotificationType::TOKEN_AVAILABLE,
+                   chrome::NOTIFICATION_TOKEN_AVAILABLE,
                    Source<TokenService>(token_service_));
 
     FilePath policy_cache_dir = policy_dir.Append(kPolicyDir);
@@ -336,11 +337,11 @@ void BrowserPolicyConnector::InitializeDevicePolicySubsystem() {
 #endif
 }
 
-void BrowserPolicyConnector::Observe(NotificationType type,
+void BrowserPolicyConnector::Observe(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (type == NotificationType::TOKEN_AVAILABLE) {
+  if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
     const TokenService* token_source =
         Source<const TokenService>(source).ptr();
     DCHECK_EQ(token_service_, token_source);
diff --git a/chrome/browser/policy/browser_policy_connector.h b/chrome/browser/policy/browser_policy_connector.h
index e58b331..0b8971f 100644
--- a/chrome/browser/policy/browser_policy_connector.h
+++ b/chrome/browser/policy/browser_policy_connector.h
@@ -113,7 +113,7 @@ class BrowserPolicyConnector : public NotificationObserver {
       CloudPolicyProvider* recommended_cloud_provider);
 
   // NotificationObserver method overrides:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
diff --git a/chrome/browser/policy/cloud_policy_subsystem.cc b/chrome/browser/policy/cloud_policy_subsystem.cc
index 7394fee..9fd0060 100644
--- a/chrome/browser/policy/cloud_policy_subsystem.cc
+++ b/chrome/browser/policy/cloud_policy_subsystem.cc
@@ -16,11 +16,11 @@
 #include "chrome/browser/policy/device_token_fetcher.h"
 #include "chrome/browser/policy/policy_notifier.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 
 namespace {
 
@@ -154,10 +154,10 @@ void CloudPolicySubsystem::UpdatePolicyRefreshRate(int64 refresh_rate) {
   }
 }
 
-void CloudPolicySubsystem::Observe(NotificationType type,
+void CloudPolicySubsystem::Observe(int type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
-  if (type == NotificationType::PREF_CHANGED) {
+  if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     DCHECK_EQ(*(Details<std::string>(details).ptr()),
               std::string(refresh_pref_name_));
     PrefService* local_state = g_browser_process->local_state();
diff --git a/chrome/browser/policy/cloud_policy_subsystem.h b/chrome/browser/policy/cloud_policy_subsystem.h
index e839716..0dfd897 100644
--- a/chrome/browser/policy/cloud_policy_subsystem.h
+++ b/chrome/browser/policy/cloud_policy_subsystem.h
@@ -120,7 +120,7 @@ class CloudPolicySubsystem
   virtual void CreateCloudPolicyController();
 
   // NotificationObserver overrides.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/policy/managed_prefs_banner_base.cc b/chrome/browser/policy/managed_prefs_banner_base.cc
index 45c824d..ca43667 100644
--- a/chrome/browser/policy/managed_prefs_banner_base.cc
+++ b/chrome/browser/policy/managed_prefs_banner_base.cc
@@ -7,9 +7,9 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/common/notification_details.h"
-#include "content/common/notification_type.h"
 
 namespace policy {
 
@@ -98,10 +98,10 @@ void ManagedPrefsBannerBase::Init(PrefService* local_state,
   }
 }
 
-void ManagedPrefsBannerBase::Observe(NotificationType type,
+void ManagedPrefsBannerBase::Observe(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
-  if (NotificationType::PREF_CHANGED == type) {
+  if (chrome::NOTIFICATION_PREF_CHANGED == type) {
     std::string* pref = Details<std::string>(details).ptr();
     if (pref && (local_state_set_->IsObserved(*pref) ||
                  user_pref_set_->IsObserved(*pref)))
diff --git a/chrome/browser/policy/managed_prefs_banner_base.h b/chrome/browser/policy/managed_prefs_banner_base.h
index 8e5d52c..3a04b2c 100644
--- a/chrome/browser/policy/managed_prefs_banner_base.h
+++ b/chrome/browser/policy/managed_prefs_banner_base.h
@@ -60,7 +60,7 @@ class ManagedPrefsBannerBase : public NotificationObserver {
             OptionsPage page);
 
   // |NotificationObserver| implementation.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/policy/policy_stubs.cc b/chrome/browser/policy/policy_stubs.cc
index b33dc77..92d1b4b 100644
--- a/chrome/browser/policy/policy_stubs.cc
+++ b/chrome/browser/policy/policy_stubs.cc
@@ -25,7 +25,7 @@ BrowserPolicyConnector* BrowserPolicyConnector::CreateForTests() {
 BrowserPolicyConnector::~BrowserPolicyConnector() {
 }
 
-void BrowserPolicyConnector::Observe(NotificationType type,
+void BrowserPolicyConnector::Observe(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
 }