Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/views/location_bar/location_bar_view.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 "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/favicon_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 #include "chrome/browser/ui/views/location_bar/ev_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
@@ skipping 795 matching lines @@
 void LocationBarView::OnSetFocus() {
   views::FocusManager* focus_manager = GetFocusManager();
   if (!focus_manager) {
     NOTREACHED();
     return;
   }
   focus_manager->SetFocusedView(this);
 }
 
 SkBitmap LocationBarView::GetFavicon() const {
-  return delegate_->GetTabContentsWrapper()->favicon_tab_helper()->GetFavicon();
+  return GetTabContentsFromDelegate(delegate_)->GetFavicon();
 }
 
 string16 LocationBarView::GetTitle() const {
   return GetTabContentsFromDelegate(delegate_)->GetTitle();
 }
 
 InstantController* LocationBarView::GetInstant() {
   return delegate_->GetInstant();
 }
 
-TabContentsWrapper* LocationBarView::GetTabContentsWrapper() const {
+TabContentsWrapper* LocationBarView::GetTabContentsWrapper() {
   return delegate_->GetTabContentsWrapper();
 }
 
 int LocationBarView::AvailableWidth(int location_bar_width) {
   return location_bar_width - location_entry_->TextWidth();
 }
 
 void LocationBarView::LayoutView(views::View* view,
                                  int padding,
                                  int available_width,
@@ skipping 170 matching lines @@
   state->selection_start = entry_start;
   state->selection_end = entry_end;
 }
 
 void LocationBarView::WriteDragDataForView(views::View* sender,
                                            const gfx::Point& press_pt,
                                            OSExchangeData* data) {
   DCHECK_NE(GetDragOperationsForView(sender, press_pt),
             ui::DragDropTypes::DRAG_NONE);
 
-  TabContentsWrapper* tab_contents = delegate_->GetTabContentsWrapper();
+  TabContents* tab_contents = GetTabContentsFromDelegate(delegate_);
   DCHECK(tab_contents);
-  drag_utils::SetURLAndDragImage(
-      tab_contents->tab_contents()->GetURL(),
-      UTF16ToWideHack(tab_contents->tab_contents()->GetTitle()),
-      tab_contents->favicon_tab_helper()->GetFavicon(),
-      data);
+  drag_utils::SetURLAndDragImage(tab_contents->GetURL(),
+                                 UTF16ToWideHack(tab_contents->GetTitle()),
+                                 tab_contents->GetFavicon(), data);
 }
 
 int LocationBarView::GetDragOperationsForView(views::View* sender,
                                               const gfx::Point& p) {
   DCHECK((sender == location_icon_view_) || (sender == ev_bubble_view_));
   TabContents* tab_contents = GetTabContentsFromDelegate(delegate_);
   return (tab_contents && tab_contents->GetURL().is_valid() &&
           !location_entry()->IsEditingOrEmpty()) ?
       (ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK) :
       ui::DragDropTypes::DRAG_NONE;
@@ skipping 130 matching lines @@
   template_url_model_ = NULL;
   ShowFirstRunBubble(bubble_type_);
 }
 
 #if defined(OS_WIN)
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->GetText().empty();
 }
 #endif