| Index: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
| diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
| index 4253caaaf19e16b453b294155a9835eaf6e037a3..8a78d43f9fe6bb7918133c7be3f89580f0b8dbe7 100644
|
| --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
| +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
| @@ -35,9 +35,6 @@
|
| #include "components/omnibox/browser/autocomplete_match.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "content/public/browser/navigation_controller.h"
|
| -#include "content/public/browser/navigation_entry.h"
|
| -#include "content/public/browser/navigation_handle.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/plugin_service.h"
|
| #include "content/public/browser/user_metrics.h"
|
| @@ -57,15 +54,8 @@ namespace {
|
|
|
| TabRendererData::NetworkState TabContentsNetworkState(
|
| WebContents* contents) {
|
| - if (!contents)
|
| + if (!contents || !contents->IsLoadingToDifferentDocument())
|
| return TabRendererData::NETWORK_STATE_NONE;
|
| - if (!contents->IsLoadingToDifferentDocument()) {
|
| - content::NavigationEntry* entry =
|
| - contents->GetController().GetLastCommittedEntry();
|
| - if (entry && (entry->GetPageType() == content::PAGE_TYPE_ERROR))
|
| - return TabRendererData::NETWORK_STATE_ERROR;
|
| - return TabRendererData::NETWORK_STATE_NONE;
|
| - }
|
| if (contents->IsWaitingForResponse())
|
| return TabRendererData::NETWORK_STATE_WAITING;
|
| return TabRendererData::NETWORK_STATE_LOADING;
|
|
|