Convert ViewMsg_NetworkStateChanged from routed -> control, allowing

content/browser/tab_contents/tab_contents.h

 // 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.
 
 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #pragma once
 
 #include <deque>
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/observer_list.h"
 #include "base/string16.h"
 #include "content/browser/javascript_dialogs.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/tab_contents/constrained_window.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/tab_contents/render_view_host_manager.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/browser/webui/web_ui.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/property_bag.h"
 #include "content/common/renderer_preferences.h"
 #include "net/base/load_states.h"
-#include "net/base/network_change_notifier.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_handle.h"
 #endif
 
 namespace gfx {
 class Rect;
 }
 
@@ skipping 13 matching lines @@
 struct ViewHostMsg_FrameNavigate_Params;
 struct WebPreferences;
 class WebUI;
 
 // Describes what goes in the main content area of a tab. TabContents is
 // the only type of TabContents, and these should be merged together.
 class TabContents : public PageNavigator,
                     public NotificationObserver,
                     public RenderViewHostDelegate,
                     public RenderViewHostManager::Delegate,
-                    public content::JavaScriptDialogDelegate,
-                    public net::NetworkChangeNotifier::OnlineStateObserver {
+                    public content::JavaScriptDialogDelegate {
  public:
   // Flags passed to the TabContentsDelegate.NavigationStateChanged to tell it
   // what has changed. Combine them to update more than one thing.
   enum InvalidateTypes {
     INVALIDATE_URL             = 1 << 0,  // The URL has changed.
     INVALIDATE_TAB             = 1 << 1,  // The favicon, app icon, or crashed
                                           // state changed.
     INVALIDATE_LOAD            = 1 << 2,  // The loading state has changed.
     INVALIDATE_PAGE_ACTIONS    = 1 << 3,  // Page action icons have changed.
     INVALIDATE_TITLE           = 1 << 4,  // The title changed.
@@ skipping 442 matching lines @@
 #elif defined(TOOLKIT_USES_GTK)
   friend class TabContentsViewGtk;
 #endif
 
   // So InterstitialPage can access SetIsLoading.
   friend class InterstitialPage;
 
   // TODO(brettw) TestTabContents shouldn't exist!
   friend class TestTabContents;
 
-  // Add all the TabContentObservers.
-  void AddObservers();
-
   // Message handlers.
   void OnDidStartProvisionalLoadForFrame(int64 frame_id,
                                          bool main_frame,
                                          bool has_opener_set,
                                          const GURL& url);
   void OnDidRedirectProvisionalLoad(int32 page_id,
                                     bool has_opener_set,
                                     const GURL& source_url,
                                     const GURL& target_url);
   void OnDidFailProvisionalLoadWithError(int64 frame_id,
@@ skipping 166 matching lines @@
   // InitWithExistingID.
   virtual bool CreateRenderViewForRenderManager(
       RenderViewHost* render_view_host);
 
   // NotificationObserver ------------------------------------------------------
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // NetworkChangeNotifier::OnlineStateObserver:
-  virtual void OnOnlineStateChanged(bool online);
-
   // Adds the given window to the list of child windows. The window will notify
   // via WillClose() when it is being destroyed.
   void AddConstrainedDialog(ConstrainedWindow* window);
 
   // Stores random bits of data for others to associate with this object.
   // WARNING: this needs to be deleted after NavigationController.
   PropertyBag property_bag_;
 
   // Data for core operation ---------------------------------------------------
 
@@ skipping 118 matching lines @@
   ObserverList<TabContentsObserver> observers_;
 
   // Content restrictions, used to disable print/copy etc based on content's
   // (full-page plugins for now only) permissions.
   int content_restrictions_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_