views: Change the LocationBarView delegate's API to GetWebContents().

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

 // Copyright (c) 2012 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"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 83 matching lines @@
 #if defined(USE_AURA)
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #endif
 
 using content::WebContents;
 using views::View;
 
 namespace {
 
-WebContents* GetWebContentsFromDelegate(LocationBarView::Delegate* delegate) {
-  const TabContents* tab_contents = delegate->GetTabContents();
-  return tab_contents ? tab_contents->web_contents() : NULL;
-}
-
-Browser* GetBrowserFromDelegate(LocationBarView::Delegate* delegate) {
-  WebContents* contents = GetWebContentsFromDelegate(delegate);
-  return browser::FindBrowserWithWebContents(contents);
-}
-
 // Height of the location bar's round corner region.
 const int kBorderRoundCornerHeight = 5;
 // Width of location bar's round corner region.
 const int kBorderRoundCornerWidth = 4;
 // Radius of the round corners inside the location bar.
 const int kBorderCornerRadius = 2;
 
 const int kDesktopItemPadding = 3;
 const int kDesktopEdgeItemPadding = kDesktopItemPadding;
 const int kDesktopScriptBadgeItemPadding = 9;
@@ skipping 407 matching lines @@
   // Windows.
   location_entry_->SetFocus();
 }
 
 void LocationBarView::SetPreviewEnabledPageAction(ExtensionAction* page_action,
                                                   bool preview_enabled) {
   if (mode_ != NORMAL)
     return;
 
   DCHECK(page_action);
-  WebContents* contents = GetWebContentsFromDelegate(delegate_);
+  WebContents* contents = delegate_->GetWebContents();
 
   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, model_->GetURL());
@@ skipping 32 matching lines @@
   }
 }
 
 void LocationBarView::ZoomChangedForActiveTab(bool can_show_bubble) {
   DCHECK(zoom_view_);
   RefreshZoomView();
 
   Layout();
   SchedulePaint();
 
-  if (can_show_bubble && zoom_view_->visible()) {
-    ZoomBubbleView::ShowBubble(
-        zoom_view_, GetWebContentsFromDelegate(delegate_), true);
-  }
+  if (can_show_bubble && zoom_view_->visible())
+    ZoomBubbleView::ShowBubble(zoom_view_, delegate_->GetWebContents(), true);
 }
 
 void LocationBarView::RefreshZoomView() {
   DCHECK(zoom_view_);
   TabContents* tab_contents = GetTabContents();
   if (!tab_contents)
     return;
 
   ZoomController* zoom_controller =
       ZoomController::FromWebContents(tab_contents->web_contents());
   zoom_view_->Update(zoom_controller);
 }
 
 void LocationBarView::ShowChromeToMobileBubble() {
   chrome::ShowChromeToMobileBubbleView(action_box_button_view_,
-                                       GetBrowserFromDelegate(delegate_));
+      browser::FindBrowserWithWebContents(delegate_->GetWebContents()));

[Peter Kasting, 2012/11/16 23:12:14]

Nit: Move "action_box_button_view_," to a new 4-space indented line as well, so
lines of arguments are aligned.

(My interpretation of the Google style guide has changed after discussion with
the internal style mailing lists.)

 }
 
 gfx::Point LocationBarView::GetLocationEntryOrigin() const {
   gfx::Point origin(location_entry_view_->bounds().origin());
   // If the UI layout is RTL, the coordinate system is not transformed and
   // therefore we need to adjust the X coordinate so that bubble appears on the
   // right hand side of the location bar.
   if (base::i18n::IsRTL())
     origin.set_x(width() - origin.x());
   views::View::ConvertPointToScreen(this, &origin);
@@ skipping 511 matching lines @@
   views::FocusManager* focus_manager = GetFocusManager();
   if (!focus_manager) {
     NOTREACHED();
     return;
   }
   focus_manager->SetFocusedView(this);
 }
 
 gfx::Image LocationBarView::GetFavicon() const {
   return FaviconTabHelper::FromWebContents(
-      delegate_->GetTabContents()->web_contents())->GetFavicon();
+      delegate_->GetWebContents())->GetFavicon();
 }
 
 string16 LocationBarView::GetTitle() const {
-  return GetWebContentsFromDelegate(delegate_)->GetTitle();
+  return delegate_->GetWebContents()->GetTitle();
 }
 
 InstantController* LocationBarView::GetInstant() {
   return delegate_->GetInstant();
 }
 
 TabContents* LocationBarView::GetTabContents() const {
-  return delegate_->GetTabContents();
+  return delegate_->GetWebContents() ?
+      TabContents::FromWebContents(delegate_->GetWebContents()) : NULL;
 }
 
 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,
@@ skipping 33 matching lines @@
   // Remember the previous visibility of the page actions so that we can
   // notify when this changes.
   std::map<ExtensionAction*, bool> old_visibility;
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i) {
     old_visibility[(*i)->image_view()->page_action()] = (*i)->visible();
   }
 
   std::vector<ExtensionAction*> new_page_actions;
 
-  WebContents* contents = GetWebContentsFromDelegate(delegate_);
+  WebContents* contents = delegate_->GetWebContents();
   if (contents) {
     extensions::TabHelper* extensions_tab_helper =
         extensions::TabHelper::FromWebContents(contents);
     extensions::LocationBarController* controller =
         extensions_tab_helper->location_bar_controller();
     new_page_actions = controller->GetCurrentActions();
   }
 
   // On startup we sometimes haven't loaded any extensions. This makes sure
   // we catch up when the extensions (and any page actions) load.
@@ skipping 49 matching lines @@
     gfx::Point screen_point(event.location());
     ConvertPointToScreen(this, &screen_point);
     omnibox_win->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
   }
 }
 #endif
 
 void LocationBarView::ShowFirstRunBubbleInternal() {
 #if !defined(OS_CHROMEOS)
   // First run bubble doesn't make sense for Chrome OS.
-  Browser* browser = GetBrowserFromDelegate(delegate_);
+  Browser* browser = browser::FindBrowserWithWebContents(

[Peter Kasting, 2012/11/16 23:12:14]

Tiny nit: Prefer to linebreak after '='

+      delegate_->GetWebContents());
   FirstRunBubble::ShowBubble(browser, location_icon_view_);
 #endif
 }
 
 void LocationBarView::PaintPageActionBackgrounds(gfx::Canvas* canvas) {
   TabContents* tab_contents = GetTabContents();
   // tab_contents may be NULL while the browser is shutting down.
   if (tab_contents == NULL)
     return;
 
@@ skipping 90 matching lines @@
   button_drag_utils::SetURLAndDragImage(web_contents->GetURL(),
                                         web_contents->GetTitle(),
                                         favicon,
                                         data,
                                         sender->GetWidget());
 }
 
 int LocationBarView::GetDragOperationsForView(views::View* sender,
                                               const gfx::Point& p) {
   DCHECK((sender == location_icon_view_) || (sender == ev_bubble_view_));
-  WebContents* web_contents = GetWebContentsFromDelegate(delegate_);
+  WebContents* web_contents = delegate_->GetWebContents();
   return (web_contents && web_contents->GetURL().is_valid() &&
           !GetLocationEntry()->IsEditingOrEmpty()) ?
       (ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK) :
       ui::DragDropTypes::DRAG_NONE;
 }
 
 bool LocationBarView::CanStartDragForView(View* sender,
                                           const gfx::Point& press_pt,
                                           const gfx::Point& p) {
   return true;
@@ skipping 204 matching lines @@
 }
 
 void LocationBarView::CleanupFadeAnimation() {
   // Since we're no longer animating we don't need our layer.
   SetPaintToLayer(false);
   // Bubble labels don't need a transparent background anymore.
   ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
   selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
 }
 #endif  // USE_AURA