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

chrome/browser/automation/automation_provider_observers_chromeos.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/automation/automation_provider_observers.h"
 
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
@@ skipping 31 matching lines @@
   }
 }
 
 LoginObserver::LoginObserver(chromeos::ExistingUserController* controller,
                              AutomationProvider* automation,
                              IPC::Message* reply_message)
     : controller_(controller),
       automation_(automation->AsWeakPtr()),
       reply_message_(reply_message) {
   controller_->set_login_status_consumer(this);
-  registrar_.Add(this, NotificationType::LOAD_STOP,
+  registrar_.Add(this, chrome::LOAD_STOP,
                  NotificationService::AllSources());
 }
 
 LoginObserver::~LoginObserver() {
   controller_->set_login_status_consumer(NULL);
 }
 
 void LoginObserver::OnLoginFailure(const chromeos::LoginFailure& error) {
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   return_value->SetString("error_string", error.GetErrorString());
   AutomationJSONReply(automation_, reply_message_.release())
       .SendSuccess(return_value.get());
   delete this;
 }
 
 void LoginObserver::OnLoginSuccess(
     const std::string& username,
     const std::string& password,
     const GaiaAuthConsumer::ClientLoginResult& credentials,
     bool pending_requests) {
   controller_->set_login_status_consumer(NULL);
 }
 
-void LoginObserver::Observe(NotificationType type,
+void LoginObserver::Observe(int type,
                             const NotificationSource& source,
                             const NotificationDetails& details) {
   AutomationJSONReply(automation_, reply_message_.release()).SendSuccess(NULL);
   delete this;
 }
 
 ScreenLockUnlockObserver::ScreenLockUnlockObserver(
     AutomationProvider* automation,
     IPC::Message* reply_message,
     bool lock_screen)
     : automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
       lock_screen_(lock_screen) {
-  registrar_.Add(this, NotificationType::SCREEN_LOCK_STATE_CHANGED,
+  registrar_.Add(this, chrome::SCREEN_LOCK_STATE_CHANGED,
                  NotificationService::AllSources());
 }
 
 ScreenLockUnlockObserver::~ScreenLockUnlockObserver() {}
 
-void ScreenLockUnlockObserver::Observe(NotificationType type,
+void ScreenLockUnlockObserver::Observe(int type,
                                        const NotificationSource& source,
                                        const NotificationDetails& details) {
-  DCHECK(type == NotificationType::SCREEN_LOCK_STATE_CHANGED);
+  DCHECK(type == chrome::SCREEN_LOCK_STATE_CHANGED);
   if (automation_) {
     AutomationJSONReply reply(automation_, reply_message_.release());
     bool is_screen_locked = *Details<bool>(details).ptr();
     if (lock_screen_ == is_screen_locked)
       reply.SendSuccess(NULL);
     else
       reply.SendError("Screen lock failure.");
   }
   delete this;
 }
@@ skipping 169 matching lines @@
   const chromeos::WifiNetworkVector& wifi_networks =
       network_library->wifi_networks();
   for (chromeos::WifiNetworkVector::const_iterator iter = wifi_networks.begin();
        iter != wifi_networks.end(); ++iter) {
     const chromeos::WifiNetwork* wifi = *iter;
     if (wifi->name() == ssid_)
       return wifi;
   }
   return NULL;
 }