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

chrome/browser/ui/webui/options/chromeos/internet_options_handler.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/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 18 matching lines @@
 #include "chrome/browser/chromeos/status/network_menu.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/time_format.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/widget/widget.h"
 
 static const char kOtherNetworksFakePath[] = "?";
 
 InternetOptionsHandler::InternetOptionsHandler()
     : chromeos::CrosOptionsPageUIHandler(
           new chromeos::UserCrosSettingsProvider) {
-  registrar_.Add(this, NotificationType::REQUIRE_PIN_SETTING_CHANGE_ENDED,
+  registrar_.Add(this, chrome::REQUIRE_PIN_SETTING_CHANGE_ENDED,
       NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::ENTER_PIN_ENDED,
+  registrar_.Add(this, chrome::ENTER_PIN_ENDED,
       NotificationService::AllSources());
   cros_ = chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   if (cros_) {
     cros_->AddNetworkManagerObserver(this);
     cros_->AddCellularDataPlanObserver(this);
     MonitorNetworks();
   }
 }
 
 InternetOptionsHandler::~InternetOptionsHandler() {
@@ skipping 452 matching lines @@
   connection_plans.SetBoolean("needsPlan", cellular->needs_new_plan());
   connection_plans.SetBoolean("activated",
       cellular->activation_state() == chromeos::ACTIVATION_STATE_ACTIVATED);
   connection_plans.Set("plans", plan_list);
   SetActivationButtonVisibility(cellular, &connection_plans);
   web_ui_->CallJavascriptFunction(
       "options.InternetOptions.updateCellularPlans", connection_plans);
 }
 
 
-void InternetOptionsHandler::Observe(NotificationType type,
+void InternetOptionsHandler::Observe(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   chromeos::CrosOptionsPageUIHandler::Observe(type, source, details);
-  if (type == NotificationType::REQUIRE_PIN_SETTING_CHANGE_ENDED) {
+  if (type == chrome::REQUIRE_PIN_SETTING_CHANGE_ENDED) {
     bool require_pin = *Details<bool>(details).ptr();
     DictionaryValue dictionary;
     dictionary.SetBoolean("requirePin", require_pin);
     web_ui_->CallJavascriptFunction(
         "options.InternetOptions.updateSecurityTab", dictionary);
-  } else if (type == NotificationType::ENTER_PIN_ENDED) {
+  } else if (type == chrome::ENTER_PIN_ENDED) {
     // We make an assumption (which is valid for now) that the SIM
     // unlock dialog is put up only when the user is trying to enable
     // mobile data.
     bool cancelled = *Details<bool>(details).ptr();
     if (cancelled) {
       DictionaryValue dictionary;
       FillNetworkInfo(&dictionary);
       web_ui_->CallJavascriptFunction(
           "options.InternetOptions.setupAttributes", dictionary);
     }
@@ skipping 653 matching lines @@
   dictionary->SetBoolean("accessLocked", cros_->IsLocked());
   dictionary->Set("wiredList", GetWiredList());
   dictionary->Set("wirelessList", GetWirelessList());
   dictionary->Set("vpnList", GetVPNList());
   dictionary->Set("rememberedList", GetRememberedList());
   dictionary->SetBoolean("wifiAvailable", cros_->wifi_available());
   dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled());
   dictionary->SetBoolean("cellularAvailable", cros_->cellular_available());
   dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled());
 }