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

chrome/browser/rlz/rlz.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.
 //
 // This code glues the RLZ library DLL with Chrome. It allows Chrome to work
 // with or without the DLL being present. If the DLL is not present the
 // functions do nothing and just return false.
 
 #include "chrome/browser/rlz/rlz.h"
 
 #include <process.h>
 #include <windows.h>
 
 #include <algorithm>
 
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 
 namespace {
 
 // The maximum length of an access points RLZ in wide chars.
@@ skipping 25 matching lines @@
 
 // This class leverages the AutocompleteEditModel notification to know when
 // the user first interacted with the omnibox and set a global accordingly.
 class OmniBoxUsageObserver : public NotificationObserver {
  public:
   OmniBoxUsageObserver(bool first_run, bool send_ping_immediately,
                        bool google_default_search)
     : first_run_(first_run),
       send_ping_immediately_(send_ping_immediately),
       google_default_search_(google_default_search) {
-    registrar_.Add(this, NotificationType::OMNIBOX_OPENED_URL,
+    registrar_.Add(this, chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
                    NotificationService::AllSources());
     // If instant is enabled we'll start searching as soon as the user starts
     // typing in the omnibox (which triggers INSTANT_CONTROLLER_UPDATED).
-    registrar_.Add(this, NotificationType::INSTANT_CONTROLLER_UPDATED,
+    registrar_.Add(this, chrome::NOTIFICATION_INSTANT_CONTROLLER_UPDATED,
                    NotificationService::AllSources());
     omnibox_used_ = false;
     DCHECK(!instance_);
     instance_ = this;
   }
 
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   static bool used() {
     return omnibox_used_;
   }
 
   // Deletes the single instance of OmniBoxUsageObserver.
   static void DeleteInstance() {
     delete instance_;
@@ skipping 128 matching lines @@
   bool first_run_;
 
   // True if Google is the default search engine for the first profile starting
   // in a browser during first run.
   bool google_default_search_;
 
 };
 
 bool DelayedInitTask::already_ran_ = false;
 
-void OmniBoxUsageObserver::Observe(NotificationType type,
+void OmniBoxUsageObserver::Observe(int type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
   // Needs to be evaluated. See http://crbug.com/62328.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   // Try to record event now, else set the flag to try later when we
   // attempt the ping.
   if (!RLZTracker::RecordProductEvent(rlz_lib::CHROME,
                                       rlz_lib::CHROME_OMNIBOX,
                                       rlz_lib::FIRST_SEARCH))
@@ skipping 94 matching lines @@
     cached_ommibox_rlz.assign(*rlz);
     access_values_state = ACCESS_VALUES_FRESH;
   }
   return true;
 }
 
 // static
 void RLZTracker::CleanupRlz() {
   OmniBoxUsageObserver::DeleteInstance();
 }