Revert 91390 (build breakage) - Convert ViewMsg_NetworkStateChanged from routed -> control

content/browser/tab_contents/tab_contents.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 "content/browser/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 183 matching lines @@
 
   render_manager_.Init(profile, site_instance, routing_id);
 
   // We have the initial size of the view be based on the size of the passed in
   // tab contents (normally a tab from the same window).
   view_->CreateView(base_tab_contents ?
       base_tab_contents->view()->GetContainerSize() : gfx::Size());
 
   registrar_.Add(this, NotificationType::RENDER_WIDGET_HOST_DESTROYED,
                  NotificationService::AllSources());
+
+  // Can only add observers after render_manager_.Init() is called, since that's
+  // what sets up the render_view_host which TabContentObserver's constructor
+  // uses to get the routing_id.
+  AddObservers();
 }
 
 TabContents::~TabContents() {
   is_being_destroyed_ = true;
 
   // We don't want any notifications while we're running our destructor.
   registrar_.RemoveAll();
 
   // Clear out any JavaScript state.
   if (delegate_)
@@ skipping 25 matching lines @@
 #endif
 
   // OnCloseStarted isn't called in unit tests.
   if (!tab_close_start_time_.is_null()) {
     UMA_HISTOGRAM_TIMES("Tab.Close",
         base::TimeTicks::Now() - tab_close_start_time_);
   }
 
   FOR_EACH_OBSERVER(TabContentsObserver, observers_, TabContentsDestroyed());
 
+  net::NetworkChangeNotifier::RemoveOnlineStateObserver(this);
+
   set_delegate(NULL);
 }
 
 // TODO(cbentzel): Either remove the debugging code, or rename to SetDelegate.
 void TabContents::set_delegate(TabContentsDelegate* delegate) {
   if (delegate == delegate_)
     return;
   if (delegate_)
     delegate_->Detach(this);
   delegate_ = delegate;
   if (delegate_)
     delegate_->Attach(this);
 }
 
+void TabContents::AddObservers() {
+  net::NetworkChangeNotifier::AddOnlineStateObserver(this);
+}
+
 bool TabContents::OnMessageReceived(const IPC::Message& message) {
   if (web_ui() && web_ui()->OnMessageReceived(message))
     return true;
 
   ObserverListBase<TabContentsObserver>::Iterator it(observers_);
   TabContentsObserver* observer;
   while ((observer = it.GetNext()) != NULL)
     if (observer->OnMessageReceived(message))
       return true;
 
@@ skipping 1550 matching lines @@
 }
 
 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) {
   render_manager_.SwapInRenderViewHost(rvh);
 }
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
   rwh_view->SetSize(view()->GetContainerSize());
 }
+
+void TabContents::OnOnlineStateChanged(bool online) {
+  render_view_host()->Send(new ViewMsg_NetworkStateChanged(
+      render_view_host()->routing_id(), online));
+}