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

chrome/browser/omnibox_search_hint.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/omnibox_search_hint.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/task.h"
 // TODO(avi): remove when conversions not needed any more
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.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/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/navigation_details.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 // The URLs of search engines for which we want to trigger the infobar.
 const char* kSearchEngineURLs[] = {
     "http://www.google.com/",
     "http://www.yahoo.com/",
     "http://www.bing.com/",
@@ skipping 100 matching lines @@
   omnibox_hint_->ShowEnteringQuery();
   return true;
 }
 
 
 // OmniboxSearchHint ----------------------------------------------------------
 
 OmniboxSearchHint::OmniboxSearchHint(TabContentsWrapper* tab) : tab_(tab) {
   NavigationController* controller = &(tab->controller());
   notification_registrar_.Add(this,
-                              NotificationType::NAV_ENTRY_COMMITTED,
+                              content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                               Source<NavigationController>(controller));
   // Fill the search_engine_urls_ map, used for faster look-up (overkill?).
   for (size_t i = 0;
        i < sizeof(kSearchEngineURLs) / sizeof(kSearchEngineURLs[0]); ++i) {
     search_engine_urls_[kSearchEngineURLs[i]] = 1;
   }
 
   // Listen for omnibox to figure-out when the user searches from the omnibox.
   notification_registrar_.Add(this,
-                              NotificationType::OMNIBOX_OPENED_URL,
+                              chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
                               Source<Profile>(tab->profile()));
 }
 
 OmniboxSearchHint::~OmniboxSearchHint() {
 }
 
-void OmniboxSearchHint::Observe(NotificationType type,
+void OmniboxSearchHint::Observe(int type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
-  if (type == NotificationType::NAV_ENTRY_COMMITTED) {
+  if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     NavigationEntry* entry = tab_->controller().GetActiveEntry();
     if (search_engine_urls_.find(entry->url().spec()) ==
         search_engine_urls_.end()) {
       // The search engine is not in our white-list, bail.
       return;
     }
     const TemplateURL* const default_provider =
         TemplateURLServiceFactory::GetForProfile(tab_->profile())->
         GetDefaultSearchProvider();
     if (!default_provider)
       return;
 
     const TemplateURLRef* const search_url = default_provider->url();
     if (search_url->GetHost() == entry->url().host())
       ShowInfoBar();
-  } else if (type == NotificationType::OMNIBOX_OPENED_URL) {
+  } else if (type == chrome::NOTIFICATION_OMNIBOX_OPENED_URL) {
     AutocompleteLog* log = Details<AutocompleteLog>(details).ptr();
     AutocompleteMatch::Type type =
         log->result.match_at(log->selected_index).type;
     if (type == AutocompleteMatch::SEARCH_WHAT_YOU_TYPED ||
         type == AutocompleteMatch::SEARCH_HISTORY ||
         type == AutocompleteMatch::SEARCH_SUGGEST) {
       // The user performed a search from the omnibox, don't show the infobar
       // again.
       DisableHint();
     }
@@ skipping 27 matching lines @@
 }
 
 // static
 bool OmniboxSearchHint::IsEnabled(Profile* profile) {
   // The infobar can only be shown if the correct switch has been provided and
   // the user did not dismiss the infobar before.
   return profile->GetPrefs()->GetBoolean(prefs::kShowOmniboxSearchHint) &&
       CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSearchInOmniboxHint);
 }