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/web_contents.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/animation/tween.h"
@@ skipping 152 matching lines @@
   TabContentsWrapper* tab_contents = parent_->GetTabContentsWrapper();
   if (!tab_contents)
     return;
 
   // Stop animation.
   if (slide_animator_.get() && slide_animator_->is_animating()) {
     slide_animator_->Reset();
     pause_animation_ = true;
   }
 
-  Profile* profile = parent_->browser()->profile();
+  Profile* profile = parent_->profile();
   ContentSettingBubbleContents* bubble = new ContentSettingBubbleContents(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          parent_->browser(),
+          parent_->delegate()->GetContentSettingBubbleModelDelegate(),
           tab_contents,
           profile,
           content_setting_image_model_->get_content_settings_type()),
       profile,
       tab_contents->web_contents(),
       this,
       views::BubbleBorder::TOP_RIGHT);
-  bubble_widget_ = browser::CreateViewsBubble(bubble);
+  bubble_widget_ = parent_->delegate()->CreateViewsBubble(bubble);
   bubble_widget_->AddObserver(this);
   bubble->Show();
 }
 
 void ContentSettingImageView::OnPaint(gfx::Canvas* canvas) {
   // During the animation we draw a border, an icon and the text. The text area
   // is changing in size during the animation, giving the appearance of the text
   // sliding out and then back in. When the text completely slid out the yellow
   // border is no longer painted around the icon. |visible_text_size_| is 0 when
   // animation is stopped.
@@ skipping 55 matching lines @@
     bubble_widget_->RemoveObserver(this);
     bubble_widget_ = NULL;
   }
   if (pause_animation_) {
     slide_animator_->Reset(
         1.0 - (visible_text_size_ * kAnimatingFraction) / text_size_);
     pause_animation_ = false;
     slide_animator_->Show();
   }
 }