Re-factor location bar/toolbar code to get rid of the browser dependency.

chrome/browser/ui/views/location_bar/content_setting_image_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/content_setting_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/window.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/animation/tween.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 
+using content::NavigationController;
 using content::WebContents;
 
 namespace {
 // Animation parameters.
 const int kOpenTimeMs = 150;
 const int kFullOpenedTimeMs = 3200;
 const int kMoveTimeMs = kFullOpenedTimeMs + 2 * kOpenTimeMs;
 const int kFrameRateHz = 60;
 // Colors for the animated box.
 const SkColor kTopBoxColor = SkColorSetRGB(0xff, 0xf8, 0xd4);
@@ skipping 120 matching lines @@
 }
 
 void ContentSettingImageView::OnMouseReleased(const views::MouseEvent& event) {
   if (!HitTest(event.location()))
     return;
 
   TabContentsWrapper* tab_contents = parent_->GetTabContentsWrapper();
   if (!tab_contents)
     return;
 
-  Profile* profile = parent_->browser()->profile();
+  Browser* browser = parent_->FindBrowser();
+  if (!browser)
+    return;
+
+  Profile* profile = browser->profile();
   ContentSettingBubbleContents* bubble = new ContentSettingBubbleContents(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          parent_->browser(),
+          browser,
           tab_contents,
           profile,
           content_setting_image_model_->get_content_settings_type()),
       profile,
       tab_contents->web_contents(),
       this,
       views::BubbleBorder::TOP_RIGHT);
   browser::CreateViewsBubble(bubble);
   bubble->Show();
 }
@@ skipping 46 matching lines @@
   canvas->GetSkCanvas()->drawRoundRect(color_rect, kBoxCornerRadius,
                                        kBoxCornerRadius, paint);
   SkPaint outer_paint;
   outer_paint.setStyle(SkPaint::kStroke_Style);
   outer_paint.setColor(kBorderColor);
   color_rect.inset(SkIntToScalar(kEdgeThickness),
                    SkIntToScalar(kEdgeThickness));
   canvas->GetSkCanvas()->drawRoundRect(color_rect, kBoxCornerRadius,
                                        kBoxCornerRadius, outer_paint);
 }