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

chrome/browser/service/service_process_control.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/service/service_process_control.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/process_util.h"
 #include "base/stl_util-inl.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/service_messages.h"
 #include "chrome/common/service_process_util.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/child_process_host.h"
 #include "content/common/notification_service.h"
 #include "ui/base/ui_base_switches.h"
 
 
 // ServiceProcessControl implementation.
 ServiceProcessControl::ServiceProcessControl() {
@@ skipping 171 matching lines @@
 
 void ServiceProcessControl::OnChannelConnected(int32 peer_pid) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // We just established a channel with the service process. Notify it if an
   // upgrade is available.
   if (UpgradeDetector::GetInstance()->notify_upgrade()) {
     Send(new ServiceMsg_UpdateAvailable);
   } else {
     if (registrar_.IsEmpty())
-      registrar_.Add(this, NotificationType::UPGRADE_RECOMMENDED,
+      registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                      NotificationService::AllSources());
   }
   RunConnectDoneTasks();
 }
 
 void ServiceProcessControl::OnChannelError() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   channel_.reset();
   RunConnectDoneTasks();
 }
 
 bool ServiceProcessControl::Send(IPC::Message* message) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!channel_.get())
     return false;
   return channel_->Send(message);
 }
 
 // NotificationObserver implementation.
-void ServiceProcessControl::Observe(NotificationType type,
+void ServiceProcessControl::Observe(int type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
-  if (type == NotificationType::UPGRADE_RECOMMENDED) {
+  if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) {
     Send(new ServiceMsg_UpdateAvailable);
   }
 }
 
 void ServiceProcessControl::OnCloudPrintProxyInfo(
     const cloud_print::CloudPrintProxyInfo& proxy_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (cloud_print_info_callback_ != NULL) {
     cloud_print_info_callback_->Run(proxy_info);
     cloud_print_info_callback_.reset();
@@ skipping 73 matching lines @@
   if (base::LaunchApp(*cmd_line_, false, true, NULL)) {
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                             NewRunnableMethod(this,
                                               &Launcher::DoDetectLaunched));
   } else {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             NewRunnableMethod(this, &Launcher::Notify));
   }
 }
 #endif  // !OS_MACOSX