Remove frontend code that allows for dynamic profile setting, and read the profile off the browse...

chrome/browser/ui/views/location_bar/content_setting_image_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/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 "content/browser/tab_contents/tab_contents.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ skipping 19 matching lines @@
 
 
 // The fraction of the animation we'll spend animating the string into view, and
 // then again animating it closed -  total animation (slide out, show, then
 // slide in) is 1.0.
 const double kAnimatingFraction = kOpenTimeMs * 1.0 / kMoveTimeMs;
 }
 
 ContentSettingImageView::ContentSettingImageView(
     ContentSettingsType content_type,
-    LocationBarView* parent,
-    Profile* profile)
+    LocationBarView* parent)
     : ui::LinearAnimation(kMoveTimeMs, kFrameRateHz, NULL),
       content_setting_image_model_(
           ContentSettingImageModel::CreateContentSettingImageModel(
               content_type)),
       parent_(parent),
-      profile_(profile),
       bubble_(NULL),
       animation_in_progress_(false),
       text_size_(0),
       visible_text_size_(0) {
   SetHorizontalAlignment(ImageView::LEADING);
 }
 
 ContentSettingImageView::~ContentSettingImageView() {
   if (bubble_)
     bubble_->Close();
@@ skipping 63 matching lines @@
     return;
 
   TabContentsWrapper* tab_contents = parent_->GetTabContentsWrapper();
   if (!tab_contents)
     return;
 
   gfx::Rect screen_bounds(GetImageBounds());
   gfx::Point origin(screen_bounds.origin());
   views::View::ConvertPointToScreen(this, &origin);
   screen_bounds.set_origin(origin);
+  Profile* profile = parent_->browser()->profile();
   ContentSettingBubbleContents* bubble_contents =
       new ContentSettingBubbleContents(
           ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-              parent_->browser(), tab_contents, profile_,
+              parent_->browser(), tab_contents, profile,
               content_setting_image_model_->get_content_settings_type()),
-          profile_, tab_contents->tab_contents());
+          profile, tab_contents->tab_contents());
   bubble_ = Bubble::Show(GetWidget(), screen_bounds, BubbleBorder::TOP_RIGHT,
                          bubble_contents, this);
   bubble_contents->set_bubble(bubble_);
 }
 
 void ContentSettingImageView::VisibilityChanged(View* starting_from,
                                                 bool is_visible) {
   if (!is_visible && bubble_)
     bubble_->Close();
 }
@@ skipping 81 matching lines @@
   } else if (state > (1.0 - kAnimatingFraction)) {
     visible_text_size_ = static_cast<int>(text_size_ * (1.0 - state) /
                                           kAnimatingFraction);
   } else {
     visible_text_size_ = text_size_;
   }
   parent_->Layout();
   parent_->SchedulePaint();
 }