| 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 1913279453b42c672b778a0debde1d48b82093c5..21c34bebee5fc5843b5a1554f7cea70cd6f25836 100644
|
| --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
| +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
|
| @@ -34,9 +34,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,17 +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;
|
| @@ -432,11 +420,6 @@ SkColor BrowserTabStripController::GetToolbarTopSeparatorColor() const {
|
| ->GetFrameView()->GetToolbarTopSeparatorColor();
|
| }
|
|
|
| -base::string16 BrowserTabStripController::GetAccessibleTabName() const {
|
| - return BrowserView::GetBrowserViewForBrowser(browser_)
|
| - ->GetAccessibleWindowTitle();
|
| -}
|
| -
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // BrowserTabStripController, TabStripModelObserver implementation:
|
|
|
|
|