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

chrome/browser/ui/webui/conflicts_ui.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/ui/webui/conflicts_ui.h"
 
 #if defined(OS_WIN)
 
 #include <string>
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/enumerate_modules_model_win.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 94 matching lines @@
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages();
 
   // Callback for the "requestModuleList" message.
   void HandleRequestModuleList(const ListValue* args);
 
  private:
   void SendModuleList();
 
-  void Observe(NotificationType type,
+  void Observe(int type,
                const NotificationSource& source,
                const NotificationDetails& details);
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ConflictsDOMHandler);
 };
 
 void ConflictsDOMHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("requestModuleList",
       NewCallback(this, &ConflictsDOMHandler::HandleRequestModuleList));
 }
 
 void ConflictsDOMHandler::HandleRequestModuleList(const ListValue* args) {
   // This request is handled asynchronously. See Observe for when we reply back.
-  registrar_.Add(this, NotificationType::MODULE_LIST_ENUMERATED,
+  registrar_.Add(this, chrome::NOTIFICATION_MODULE_LIST_ENUMERATED,
                  NotificationService::AllSources());
   EnumerateModulesModel::GetInstance()->ScanNow();
 }
 
 void ConflictsDOMHandler::SendModuleList() {
   EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetInstance();
   ListValue* list = loaded_modules->GetModuleList();
   DictionaryValue results;
   results.Set("moduleList", list);
 
@@ skipping 10 matching lines @@
         IDS_CONFLICTS_CHECK_PAGE_TABLE_TITLE_SUFFIX_TWO,
             base::IntToString16(list->GetSize()),
             base::IntToString16(confirmed_bad),
             base::IntToString16(suspected_bad));
   }
   results.SetString("modulesTableTitle", table_title);
 
   web_ui_->CallJavascriptFunction("returnModuleList", results);
 }
 
-void ConflictsDOMHandler::Observe(NotificationType type,
+void ConflictsDOMHandler::Observe(int type,
                                   const NotificationSource& source,
                                   const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::MODULE_LIST_ENUMERATED:
+  switch (type) {
+    case chrome::NOTIFICATION_MODULE_LIST_ENUMERATED:
       SendModuleList();
       registrar_.RemoveAll();
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace
@@ skipping 16 matching lines @@
   contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
 }
 
 // static
 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_CONFLICT_FAVICON);
 }
 
 #endif