Index: content/browser/tab_contents/tab_contents.h |
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h |
index bc2bdd36c5b85c5e83f93b23332e5236bb4b1ed8..c38287dd3954ff054d9fae7462fae744fb7e85da 100644 |
--- a/content/browser/tab_contents/tab_contents.h |
+++ b/content/browser/tab_contents/tab_contents.h |
@@ -13,6 +13,7 @@ |
#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" |
@@ -27,7 +28,6 @@ |
#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) |
@@ -61,8 +61,7 @@ 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. |
@@ -525,9 +524,6 @@ class TabContents : public PageNavigator, |
// 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, |
@@ -714,9 +710,6 @@ class TabContents : public PageNavigator, |
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); |