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

chrome/browser/metrics/metrics_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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is typically created at application startup.  It
@@ skipping 163 matching lines @@
 #include "chrome/browser/metrics/histogram_synchronizer.h"
 #include "chrome/browser/metrics/metrics_log.h"
 #include "chrome/browser/metrics/metrics_reporting_scheduler.h"
 #include "chrome/browser/net/network_stats.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/browser/search_engines/template_url_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/child_process_logging.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/guid.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/common/child_process_info.h"
 #include "content/common/notification_service.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugininfo.h"
@@ skipping 332 matching lines @@
 }
 
 bool MetricsService::reporting_active() const {
   DCHECK(IsSingleThreaded());
   return reporting_active_;
 }
 
 // static
 void MetricsService::SetUpNotifications(NotificationRegistrar* registrar,
                                         NotificationObserver* observer) {
-    registrar->Add(observer, NotificationType::BROWSER_OPENED,
+    registrar->Add(observer, chrome::BROWSER_OPENED,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::BROWSER_CLOSED,
+    registrar->Add(observer, chrome::BROWSER_CLOSED,
                    NotificationService::AllSources());
     registrar->Add(observer, NotificationType::USER_ACTION,
                    NotificationService::AllSources());
     registrar->Add(observer, NotificationType::TAB_PARENTED,
                    NotificationService::AllSources());
     registrar->Add(observer, NotificationType::TAB_CLOSING,
                    NotificationService::AllSources());
     registrar->Add(observer, NotificationType::LOAD_START,
                    NotificationService::AllSources());
     registrar->Add(observer, NotificationType::LOAD_STOP,
                    NotificationService::AllSources());
     registrar->Add(observer, NotificationType::RENDERER_PROCESS_CLOSED,
                    NotificationService::AllSources());
     registrar->Add(observer, NotificationType::RENDERER_PROCESS_HANG,
                    NotificationService::AllSources());
     registrar->Add(observer, NotificationType::CHILD_PROCESS_HOST_CONNECTED,
                    NotificationService::AllSources());
     registrar->Add(observer, NotificationType::CHILD_INSTANCE_CREATED,
                    NotificationService::AllSources());
     registrar->Add(observer, NotificationType::CHILD_PROCESS_CRASHED,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::TEMPLATE_URL_SERVICE_LOADED,
+    registrar->Add(observer, chrome::TEMPLATE_URL_SERVICE_LOADED,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::OMNIBOX_OPENED_URL,
+    registrar->Add(observer, chrome::OMNIBOX_OPENED_URL,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::BOOKMARK_MODEL_LOADED,
+    registrar->Add(observer, chrome::BOOKMARK_MODEL_LOADED,
                    NotificationService::AllSources());
 }
 
 void MetricsService::Observe(NotificationType type,
                              const NotificationSource& source,
                              const NotificationDetails& details) {
   DCHECK(current_log_);
   DCHECK(IsSingleThreaded());
 
   if (!CanLogNotification(type, source, details))
     return;
 
   switch (type.value) {
     case NotificationType::USER_ACTION:
         current_log_->RecordUserAction(*Details<const char*>(details).ptr());
       break;
 
-    case NotificationType::BROWSER_OPENED:
-    case NotificationType::BROWSER_CLOSED:
+    case chrome::BROWSER_OPENED:
+    case chrome::BROWSER_CLOSED:
       LogWindowChange(type, source, details);
       break;
 
     case NotificationType::TAB_PARENTED:
     case NotificationType::TAB_CLOSING:
       LogWindowChange(type, source, details);
       break;
 
     case NotificationType::LOAD_STOP:
       LogLoadComplete(type, source, details);
@@ skipping 22 matching lines @@
     case NotificationType::RENDERER_PROCESS_HANG:
       LogRendererHang();
       break;
 
     case NotificationType::CHILD_PROCESS_HOST_CONNECTED:
     case NotificationType::CHILD_PROCESS_CRASHED:
     case NotificationType::CHILD_INSTANCE_CREATED:
       LogChildProcessChange(type, source, details);
       break;
 
-    case NotificationType::TEMPLATE_URL_SERVICE_LOADED:
+    case chrome::TEMPLATE_URL_SERVICE_LOADED:
       LogKeywords(Source<TemplateURLService>(source).ptr());
       break;
 
-    case NotificationType::OMNIBOX_OPENED_URL: {
+    case chrome::OMNIBOX_OPENED_URL: {
       MetricsLog* current_log = current_log_->AsMetricsLog();
       DCHECK(current_log);
       current_log->RecordOmniboxOpenedURL(
           *Details<AutocompleteLog>(details).ptr());
       break;
     }
 
-    case NotificationType::BOOKMARK_MODEL_LOADED: {
+    case chrome::BOOKMARK_MODEL_LOADED: {
       Profile* p = Source<Profile>(source).ptr();
       if (p)
         LogBookmarks(p->GetBookmarkModel());
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 
@@ skipping 748 matching lines @@
   if (window_map_.find(window_or_tab) == window_map_.end()) {
     controller_id = next_window_id_++;
     window_map_[window_or_tab] = controller_id;
   } else {
     controller_id = window_map_[window_or_tab];
   }
   DCHECK_NE(controller_id, -1);
 
   switch (type.value) {
     case NotificationType::TAB_PARENTED:
-    case NotificationType::BROWSER_OPENED:
+    case chrome::BROWSER_OPENED:
       window_type = MetricsLog::WINDOW_CREATE;
       break;
 
     case NotificationType::TAB_CLOSING:
-    case NotificationType::BROWSER_CLOSED:
+    case chrome::BROWSER_CLOSED:
       window_map_.erase(window_map_.find(window_or_tab));
       window_type = MetricsLog::WINDOW_DESTROY;
       break;
 
     default:
       NOTREACHED();
       return;
   }
 
   // TODO(brettw) we should have some kind of ID for the parent.
@@ skipping 267 matching lines @@
     thread_id = base::PlatformThread::CurrentId();
   return base::PlatformThread::CurrentId() == thread_id;
 }
 
 #if defined(OS_CHROMEOS)
 void MetricsService::StartExternalMetrics() {
   external_metrics_ = new chromeos::ExternalMetrics;
   external_metrics_->Start();
 }
 #endif