Make pink's TabContentsWrapper change compile on Windows....

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // Copyright (c) 2010 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/views/location_bar/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
 #include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.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/extensions_service.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/location_bar/suggested_text_view.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/browser_dialogs.h"
 #include "chrome/browser/views/location_bar/content_setting_image_view.h"
 #include "chrome/browser/views/location_bar/ev_bubble_view.h"
 #include "chrome/browser/views/location_bar/keyword_hint_view.h"
 #include "chrome/browser/views/location_bar/location_icon_view.h"
 #include "chrome/browser/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/views/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/views/location_bar/selected_keyword_view.h"
 #include "chrome/browser/views/location_bar/star_view.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/color_utils.h"
 #include "gfx/skia_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/label.h"
 #include "views/drag_utils.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/views/first_run_bubble.h"
 #endif
 
 using views::View;
 
+namespace {
+TabContents* GetTabContentsFromDelegate(LocationBarView::Delegate* delegate) {
+  const TabContentsWrapper* wrapper = delegate->GetTabContentsWrapper();
+  return wrapper ? wrapper->tab_contents() : NULL;
+}
+}  // namespace
+
 // static
 const int LocationBarView::kNormalHorizontalEdgeThickness = 1;
 const int LocationBarView::kVerticalEdgeThickness = 2;
 const int LocationBarView::kItemPadding = 3;
 const int LocationBarView::kExtensionItemPadding = 5;
 const int LocationBarView::kEdgeItemPadding = kItemPadding;
 const int LocationBarView::kBubblePadding = 1;
 const char LocationBarView::kViewClassName[] =
     "browser/views/location_bar/LocationBarView";
 
@@ skipping 265 matching lines @@
     profile_ = profile;
     location_entry_->model()->SetProfile(profile);
     selected_keyword_view_->set_profile(profile);
     keyword_hint_view_->set_profile(profile);
     for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
          i != content_setting_views_.end(); ++i)
       (*i)->set_profile(profile);
   }
 }
 
-TabContents* LocationBarView::GetTabContents() const {
-  return delegate_->GetTabContents();
+TabContentsWrapper* LocationBarView::GetTabContentsWrapper() const {
+  return delegate_->GetTabContentsWrapper();
 }
 
 void LocationBarView::SetPreviewEnabledPageAction(ExtensionAction* page_action,
                                                   bool preview_enabled) {
   if (mode_ != NORMAL)
     return;
 
   DCHECK(page_action);
-  TabContents* contents = delegate_->GetTabContents();
+  TabContents* contents = GetTabContentsFromDelegate(delegate_);
 
   RefreshPageActionViews();
   PageActionWithBadgeView* page_action_view =
       static_cast<PageActionWithBadgeView*>(GetPageActionView(page_action));
   DCHECK(page_action_view);
   if (!page_action_view)
     return;
 
   page_action_view->image_view()->set_preview_enabled(preview_enabled);
   page_action_view->UpdateVisibility(contents,
@@ skipping 473 matching lines @@
 
 void LocationBarView::OnChanged() {
   location_icon_view_->SetImage(
       ResourceBundle::GetSharedInstance().GetBitmapNamed(
           location_entry_->GetIcon()));
   Layout();
   SchedulePaint();
 
   InstantController* instant = delegate_->GetInstant();
   string16 suggested_text;
-  if (update_instant_ && instant && GetTabContents()) {
+  if (update_instant_ && instant && GetTabContentsWrapper()) {
     if (location_entry_->model()->user_input_in_progress() &&
         location_entry_->model()->popup_model()->IsOpen()) {
-      instant->Update(GetTabContents(),
+      instant->Update(GetTabContentsWrapper(),
                       location_entry_->model()->CurrentMatch(),
                       WideToUTF16(location_entry_->GetText()),
                       &suggested_text);
     } else {
       instant->DestroyPreviewContents();
     }
   }
 
   SetSuggestedText(suggested_text);
 }
@@ skipping 13 matching lines @@
 void LocationBarView::OnSetFocus() {
   views::FocusManager* focus_manager = GetFocusManager();
   if (!focus_manager) {
     NOTREACHED();
     return;
   }
   focus_manager->SetFocusedView(this);
 }
 
 SkBitmap LocationBarView::GetFavIcon() const {
-  DCHECK(delegate_);
-  DCHECK(delegate_->GetTabContents());
-  return delegate_->GetTabContents()->GetFavIcon();
+  return GetTabContentsFromDelegate(delegate_)->GetFavIcon();
 }
 
 std::wstring LocationBarView::GetTitle() const {
-  DCHECK(delegate_);
-  DCHECK(delegate_->GetTabContents());
-  return UTF16ToWideHack(delegate_->GetTabContents()->GetTitle());
+  return UTF16ToWideHack(GetTabContentsFromDelegate(delegate_)->GetTitle());
 }
 
 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,
                                  bool leading,
                                  gfx::Rect* bounds) {
   DCHECK(view && bounds);
   gfx::Size view_size = view->GetPreferredSize();
   if ((view_size.width() + padding) > available_width)
     view_size = view->GetMinimumSize();
   int desired_width = view_size.width() + padding;
   view->SetVisible(desired_width < bounds->width());
   if (view->IsVisible()) {
     view->SetBounds(
         leading ? bounds->x() : (bounds->right() - view_size.width()),
         view->y(), view_size.width(), view->height());
     bounds->set_width(bounds->width() - desired_width);
   }
 }
 
 void LocationBarView::RefreshContentSettingViews() {
-  const TabContents* tab_contents = delegate_->GetTabContents();
   for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
        i != content_setting_views_.end(); ++i) {
     (*i)->UpdateFromTabContents(
-        model_->input_in_progress() ? NULL : tab_contents);
+        model_->input_in_progress() ? NULL : GetTabContentsFromDelegate(delegate_));
   }
 }
 
 void LocationBarView::DeletePageActionViews() {
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i)
     RemoveChildView(*i);
   STLDeleteElements(&page_action_views_);
 }
 
@@ skipping 28 matching lines @@
     // Add the page actions in reverse order, so that the child views are
     // inserted in left-to-right order for accessibility.
     for (int i = page_actions.size() - 1; i >= 0; --i) {
       page_action_views_[i] = new PageActionWithBadgeView(
           new PageActionImageView(this, profile_, page_actions[i]));
       page_action_views_[i]->SetVisible(false);
       AddChildView(GetChildIndex(star_view_), page_action_views_[i]);
     }
   }
 
-  TabContents* contents = delegate_->GetTabContents();
+  TabContents* contents = GetTabContentsFromDelegate(delegate_);
   if (!page_action_views_.empty() && contents) {
     GURL url = GURL(WideToUTF8(model_->GetText()));
 
     for (PageActionViews::const_iterator i(page_action_views_.begin());
          i != page_action_views_.end(); ++i) {
       (*i)->UpdateVisibility(model_->input_in_progress() ? NULL : contents,
                              url);
 
       // Check if the visibility of the action changed and notify if it did.
       ExtensionAction* action = (*i)->image_view()->page_action();
@@ skipping 82 matching lines @@
 
 AccessibilityTypes::Role LocationBarView::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_GROUPING;
 }
 
 void LocationBarView::WriteDragData(views::View* sender,
                                     const gfx::Point& press_pt,
                                     OSExchangeData* data) {
   DCHECK(GetDragOperations(sender, press_pt) != DragDropTypes::DRAG_NONE);
 
-  TabContents* tab_contents = delegate_->GetTabContents();
+  TabContents* tab_contents = GetTabContentsFromDelegate(delegate_);
   DCHECK(tab_contents);
   drag_utils::SetURLAndDragImage(tab_contents->GetURL(),
                                  UTF16ToWideHack(tab_contents->GetTitle()),
                                  tab_contents->GetFavIcon(), data);
 }
 
 int LocationBarView::GetDragOperations(views::View* sender,
                                        const gfx::Point& p) {
   DCHECK((sender == location_icon_view_) || (sender == ev_bubble_view_));
-  TabContents* tab_contents = delegate_->GetTabContents();
+  TabContents* tab_contents = GetTabContentsFromDelegate(delegate_);
   return (tab_contents && tab_contents->GetURL().is_valid() &&
           !location_entry()->IsEditingOrEmpty()) ?
       (DragDropTypes::DRAG_COPY | DragDropTypes::DRAG_LINK) :
       DragDropTypes::DRAG_NONE;
 }
 
 bool LocationBarView::CanStartDrag(View* sender,
                                    const gfx::Point& press_pt,
                                    const gfx::Point& p) {
   return true;
@@ skipping 132 matching lines @@
   }
 
   NOTREACHED();
 }
 
 void LocationBarView::OnTemplateURLModelChanged() {
   template_url_model_->RemoveObserver(this);
   template_url_model_ = NULL;
   ShowFirstRunBubble(bubble_type_);
 }