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

chrome/browser/chromeos/offline/offline_load_page.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/chromeos/offline/offline_load_page.h"
 
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/string_piece.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 // Maximum time to show a blank page.
 const int kMaxBlankPeriod = 3000;
 
@@ skipping 25 matching lines @@
 }
 
 OfflineLoadPage::OfflineLoadPage(TabContents* tab_contents,
                                  const GURL& url,
                                  Delegate* delegate)
     : ChromeInterstitialPage(tab_contents, true, url),
       delegate_(delegate),
       proceeded_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       in_test_(false) {
-  registrar_.Add(this, NotificationType::NETWORK_STATE_CHANGED,
+  registrar_.Add(this, chrome::NETWORK_STATE_CHANGED,
                  NotificationService::AllSources());
 }
 
 OfflineLoadPage::~OfflineLoadPage() {}
 
 std::string OfflineLoadPage::GetHTMLContents() {
   DictionaryValue strings;
   int64 time_to_wait = std::max(
       static_cast<int64>(0),
       kMaxBlankPeriod -
@@ skipping 106 matching lines @@
 }
 
 void OfflineLoadPage::DontProceed() {
   // Inogre if it's already proceeded.
   if (proceeded_)
     return;
   delegate_->OnBlockingPageComplete(false);
   InterstitialPage::DontProceed();
 }
 
-void OfflineLoadPage::Observe(NotificationType type,
+void OfflineLoadPage::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
-  if (type.value == NotificationType::NETWORK_STATE_CHANGED) {
+  if (type == chrome::NETWORK_STATE_CHANGED) {
     chromeos::NetworkStateDetails* state_details =
         Details<chromeos::NetworkStateDetails>(details).ptr();
     DVLOG(1) << "NetworkStateChanaged notification received: state="
              << state_details->state();
     if (state_details->state() ==
         chromeos::NetworkStateDetails::CONNECTED) {
-      registrar_.Remove(this, NotificationType::NETWORK_STATE_CHANGED,
+      registrar_.Remove(this, chrome::NETWORK_STATE_CHANGED,
                         NotificationService::AllSources());
       Proceed();
     }
   } else {
     ChromeInterstitialPage::Observe(type, source, details);
   }
 }
 
 bool OfflineLoadPage::ShowActivationMessage() {
   CrosLibrary* cros = CrosLibrary::Get();
   if (!cros || !cros->GetNetworkLibrary()->cellular_available())
     return false;
 
   const CellularNetworkVector& cell_networks =
       cros->GetNetworkLibrary()->cellular_networks();
   for (size_t i = 0; i < cell_networks.size(); ++i) {
     chromeos::ActivationState activation_state =
         cell_networks[i]->activation_state();
     if (activation_state == ACTIVATION_STATE_ACTIVATED)
       return false;
   }
   return true;
 }
 
 }  // namespace chromeos