| Index: content/browser/tab_contents/tab_contents.h
|
| ===================================================================
|
| --- content/browser/tab_contents/tab_contents.h (revision 91391)
|
| +++ content/browser/tab_contents/tab_contents.h (working copy)
|
| @@ -13,7 +13,6 @@
|
| #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"
|
| @@ -28,6 +27,7 @@
|
| #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,7 +61,8 @@
|
| public NotificationObserver,
|
| public RenderViewHostDelegate,
|
| public RenderViewHostManager::Delegate,
|
| - public content::JavaScriptDialogDelegate {
|
| + public content::JavaScriptDialogDelegate,
|
| + public net::NetworkChangeNotifier::OnlineStateObserver {
|
| public:
|
| // Flags passed to the TabContentsDelegate.NavigationStateChanged to tell it
|
| // what has changed. Combine them to update more than one thing.
|
| @@ -514,6 +515,9 @@
|
| // 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,
|
| @@ -700,6 +704,9 @@
|
| 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);
|
|
|