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::NOTIFICATION_BROWSER_OPENED,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::BROWSER_CLOSED,
+    registrar->Add(observer, chrome::NOTIFICATION_BROWSER_CLOSED,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::USER_ACTION,
+    registrar->Add(observer, content::NOTIFICATION_USER_ACTION,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::TAB_PARENTED,
+    registrar->Add(observer, content::NOTIFICATION_TAB_PARENTED,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::TAB_CLOSING,
+    registrar->Add(observer, content::NOTIFICATION_TAB_CLOSING,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::LOAD_START,
+    registrar->Add(observer, content::NOTIFICATION_LOAD_START,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::LOAD_STOP,
+    registrar->Add(observer, content::NOTIFICATION_LOAD_STOP,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::RENDERER_PROCESS_CLOSED,
+    registrar->Add(observer, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::RENDERER_PROCESS_HANG,
+    registrar->Add(observer, content::NOTIFICATION_RENDERER_PROCESS_HANG,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::CHILD_PROCESS_HOST_CONNECTED,
+    registrar->Add(observer, content::NOTIFICATION_CHILD_PROCESS_HOST_CONNECTED,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::CHILD_INSTANCE_CREATED,
+    registrar->Add(observer, content::NOTIFICATION_CHILD_INSTANCE_CREATED,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::CHILD_PROCESS_CRASHED,
+    registrar->Add(observer, content::NOTIFICATION_CHILD_PROCESS_CRASHED,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::TEMPLATE_URL_SERVICE_LOADED,
+    registrar->Add(observer, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::OMNIBOX_OPENED_URL,
+    registrar->Add(observer, chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
                    NotificationService::AllSources());
-    registrar->Add(observer, NotificationType::BOOKMARK_MODEL_LOADED,
+    registrar->Add(observer, chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED,
                    NotificationService::AllSources());
 }
 
-void MetricsService::Observe(NotificationType type,
+void MetricsService::Observe(int 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:
+  switch (type) {
+    case content::NOTIFICATION_USER_ACTION:
         current_log_->RecordUserAction(*Details<const char*>(details).ptr());
       break;
 
-    case NotificationType::BROWSER_OPENED:
-    case NotificationType::BROWSER_CLOSED:
+    case chrome::NOTIFICATION_BROWSER_OPENED:
+    case chrome::NOTIFICATION_BROWSER_CLOSED:
       LogWindowChange(type, source, details);
       break;
 
-    case NotificationType::TAB_PARENTED:
-    case NotificationType::TAB_CLOSING:
+    case content::NOTIFICATION_TAB_PARENTED:
+    case content::NOTIFICATION_TAB_CLOSING:
       LogWindowChange(type, source, details);
       break;
 
-    case NotificationType::LOAD_STOP:
+    case content::NOTIFICATION_LOAD_STOP:
       LogLoadComplete(type, source, details);
       break;
 
-    case NotificationType::LOAD_START:
+    case content::NOTIFICATION_LOAD_START:
       LogLoadStarted();
       break;
 
-    case NotificationType::RENDERER_PROCESS_CLOSED: {
+    case content::NOTIFICATION_RENDERER_PROCESS_CLOSED: {
         RenderProcessHost::RendererClosedDetails* process_details =
             Details<RenderProcessHost::RendererClosedDetails>(details).ptr();
         if (process_details->status ==
             base::TERMINATION_STATUS_PROCESS_CRASHED ||
             process_details->status ==
             base::TERMINATION_STATUS_ABNORMAL_TERMINATION) {
           if (process_details->was_extension_renderer) {
             LogExtensionRendererCrash();
           } else {
             LogRendererCrash();
           }
         }
       }
       break;
 
-    case NotificationType::RENDERER_PROCESS_HANG:
+    case content::NOTIFICATION_RENDERER_PROCESS_HANG:
       LogRendererHang();
       break;
 
-    case NotificationType::CHILD_PROCESS_HOST_CONNECTED:
-    case NotificationType::CHILD_PROCESS_CRASHED:
-    case NotificationType::CHILD_INSTANCE_CREATED:
+    case content::NOTIFICATION_CHILD_PROCESS_HOST_CONNECTED:
+    case content::NOTIFICATION_CHILD_PROCESS_CRASHED:
+    case content::NOTIFICATION_CHILD_INSTANCE_CREATED:
       LogChildProcessChange(type, source, details);
       break;
 
-    case NotificationType::TEMPLATE_URL_SERVICE_LOADED:
+    case chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED:
       LogKeywords(Source<TemplateURLService>(source).ptr());
       break;
 
-    case NotificationType::OMNIBOX_OPENED_URL: {
+    case chrome::NOTIFICATION_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::NOTIFICATION_BOOKMARK_MODEL_LOADED: {
       Profile* p = Source<Profile>(source).ptr();
       if (p)
         LogBookmarks(p->GetBookmarkModel());
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 
@@ skipping 728 matching lines @@
   VLOG(1) << "Verify your metrics logs are formatted correctly.  Verify server "
              "is active at " << server_url_;
   if (!pending_log()) {
     VLOG(1) << "METRICS: Recorder shutdown during log transmission.";
   } else {
     VLOG(1) << "METRICS: transmission retry being scheduled for "
             << compressed_log_;
   }
 }
 
-void MetricsService::LogWindowChange(NotificationType type,
+void MetricsService::LogWindowChange(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   int controller_id = -1;
   uintptr_t window_or_tab = source.map_key();
   MetricsLog::WindowEventType window_type;
 
   // Note: since we stop all logging when a single OTR session is active, it is
   // possible that we start getting notifications about a window that we don't
   // know about.
   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:
+  switch (type) {
+    case content::NOTIFICATION_TAB_PARENTED:
+    case chrome::NOTIFICATION_BROWSER_OPENED:
       window_type = MetricsLog::WINDOW_CREATE;
       break;
 
-    case NotificationType::TAB_CLOSING:
-    case NotificationType::BROWSER_CLOSED:
+    case content::NOTIFICATION_TAB_CLOSING:
+    case chrome::NOTIFICATION_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.
   current_log_->RecordWindowEvent(window_type, controller_id, 0);
 }
 
-void MetricsService::LogLoadComplete(NotificationType type,
+void MetricsService::LogLoadComplete(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   if (details == NotificationService::NoDetails())
     return;
 
   // TODO(jar): There is a bug causing this to be called too many times, and
   // the log overflows.  For now, we won't record these events.
   UMA_HISTOGRAM_COUNTS("UMA.LogLoadComplete called", 1);
   return;
 
@@ skipping 53 matching lines @@
     IncrementPrefValue(prefs::kStabilitySystemUncleanShutdownCount);
   else
     NOTREACHED() << "Unexpected Chrome OS crash type " << crash_type;
   // Wake up metrics logs sending if necessary now that new
   // log data is available.
   HandleIdleSinceLastTransmission(false);
 }
 #endif  // OS_CHROMEOS
 
 void MetricsService::LogChildProcessChange(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   Details<ChildProcessInfo> child_details(details);
   const std::wstring& child_name = child_details->name();
 
   if (child_process_stats_buffer_.find(child_name) ==
       child_process_stats_buffer_.end()) {
     child_process_stats_buffer_[child_name] =
         ChildProcessStats(child_details->type());
   }
 
   ChildProcessStats& stats = child_process_stats_buffer_[child_name];
-  switch (type.value) {
-    case NotificationType::CHILD_PROCESS_HOST_CONNECTED:
+  switch (type) {
+    case content::NOTIFICATION_CHILD_PROCESS_HOST_CONNECTED:
       stats.process_launches++;
       break;
 
-    case NotificationType::CHILD_INSTANCE_CREATED:
+    case content::NOTIFICATION_CHILD_INSTANCE_CREATED:
       stats.instances++;
       break;
 
-    case NotificationType::CHILD_PROCESS_CRASHED:
+    case content::NOTIFICATION_CHILD_PROCESS_CRASHED:
       stats.process_crashes++;
       // Exclude plugin crashes from the count below because we report them via
       // a separate UMA metric.
       if (child_details->type() != ChildProcessInfo::PLUGIN_PROCESS) {
         IncrementPrefValue(prefs::kStabilityChildProcessCrashCount);
       }
       break;
 
     default:
-      NOTREACHED() << "Unexpected notification type " << type.value;
+      NOTREACHED() << "Unexpected notification type " << type;
       return;
   }
 }
 
 // Recursively counts the number of bookmarks and folders in node.
 static void CountBookmarks(const BookmarkNode* node,
                            int* bookmarks,
                            int* folders) {
   if (node->is_url())
     (*bookmarks)++;
@@ skipping 109 matching lines @@
                             stats.process_launches);
     plugin_dict->SetInteger(prefs::kStabilityPluginCrashes,
                             stats.process_crashes);
     plugin_dict->SetInteger(prefs::kStabilityPluginInstances,
                             stats.instances);
     plugins->Append(plugin_dict);
   }
   child_process_stats_buffer_.clear();
 }
 
-bool MetricsService::CanLogNotification(NotificationType type,
+bool MetricsService::CanLogNotification(int type,
                                         const NotificationSource& source,
                                         const NotificationDetails& details) {
   // We simply don't log anything to UMA if there is a single incognito
   // session visible. The problem is that we always notify using the orginal
   // profile in order to simplify notification processing.
   return !BrowserList::IsOffTheRecordSessionActive();
 }
 
 void MetricsService::RecordBooleanPrefValue(const char* path, bool value) {
   DCHECK(IsSingleThreaded());
@@ skipping 17 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