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

content/browser/plugin_service.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 "content/browser/plugin_service.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/ppapi_plugin_process_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/resource_context.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/content_switches.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugininfo.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 using ::base::files::FilePathWatcher;
 #endif
@@ skipping 59 matching lines @@
                        webkit::npapi::kRegistryMozillaPlugins,
                        KEY_NOTIFY) == ERROR_SUCCESS) {
     if (hklm_key_.StartWatching() == ERROR_SUCCESS) {
       hklm_event_.reset(new base::WaitableEvent(hklm_key_.watch_event()));
       hklm_watcher_.StartWatching(hklm_event_.get(), this);
     }
   }
 #elif defined(OS_MACOSX)
   // We need to know when the browser comes forward so we can bring modal plugin
   // windows forward too.
-  registrar_.Add(this, NotificationType::APP_ACTIVATED,
+  registrar_.Add(this, content::NOTIFICATION_APP_ACTIVATED,
                  NotificationService::AllSources());
 #elif defined(OS_POSIX)
 // The FilePathWatcher produces too many false positives on MacOS (access time
 // updates?) which will lead to enforcing updates of the plugins way too often.
 // On ChromeOS the user can't install plugins anyway and on Windows all
 // important plugins register themselves in the registry so no need to do that.
   file_watcher_delegate_ = new PluginDirWatcherDelegate();
   // Get the list of all paths for registering the FilePathWatchers
   // that will track and if needed reload the list of plugins on runtime.
   std::vector<FilePath> plugin_dirs;
@@ skipping 11 matching lines @@
     FilePathWatcher* watcher = new FilePathWatcher();
     VLOG(1) << "Watching for changes in: " << plugin_dirs[i].value();
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         NewRunnableFunction(
             &PluginService::RegisterFilePathWatcher,
             watcher, plugin_dirs[i], file_watcher_delegate_));
     file_watchers_.push_back(watcher);
   }
 #endif
-  registrar_.Add(this, NotificationType::PLUGIN_ENABLE_STATUS_CHANGED,
+  registrar_.Add(this, content::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED,
                  NotificationService::AllSources());
   registrar_.Add(this,
-                 NotificationType::RENDERER_PROCESS_CLOSED,
+                 content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                  NotificationService::AllSources());
 }
 
 PluginService::~PluginService() {
 #if defined(OS_WIN)
   // Release the events since they're owned by RegKey, not WaitableEvent.
   hkcu_watcher_.StopWatching();
   hklm_watcher_.StopWatching();
   if (hkcu_event_.get())
     hkcu_event_->Release();
@@ skipping 232 matching lines @@
   }
 
   webkit::npapi::PluginList::Singleton()->RefreshPlugins();
   PurgePluginListCache(true);
 #else
   // This event should only get signaled on a Windows machine.
   NOTREACHED();
 #endif  // defined(OS_WIN)
 }
 
-void PluginService::Observe(NotificationType type,
+void PluginService::Observe(int type,
                             const NotificationSource& source,
                             const NotificationDetails& details) {
-  switch (type.value) {
+  switch (type) {
 #if defined(OS_MACOSX)
-    case NotificationType::APP_ACTIVATED: {
+    case content::NOTIFICATION_APP_ACTIVATED: {
       BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                               NewRunnableFunction(&NotifyPluginsOfActivation));
       break;
     }
 #endif
 
-    case NotificationType::PLUGIN_ENABLE_STATUS_CHANGED: {
+    case content::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED: {
       webkit::npapi::PluginList::Singleton()->RefreshPlugins();
       PurgePluginListCache(false);
       break;
     }
-    case NotificationType::RENDERER_PROCESS_CLOSED: {
+    case content::NOTIFICATION_RENDERER_PROCESS_CLOSED: {
       int render_process_id = Source<RenderProcessHost>(source).ptr()->id();
 
       base::AutoLock auto_lock(overridden_plugins_lock_);
       for (size_t i = 0; i < overridden_plugins_.size(); ++i) {
         if (overridden_plugins_[i].render_process_id == render_process_id) {
           overridden_plugins_.erase(overridden_plugins_.begin() + i);
           break;
         }
       }
       break;
@@ skipping 66 matching lines @@
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 // static
 void PluginService::RegisterFilePathWatcher(
     FilePathWatcher *watcher,
     const FilePath& path,
     FilePathWatcher::Delegate* delegate) {
   bool result = watcher->Watch(path, delegate);
   DCHECK(result);
 }
 #endif