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

chrome/browser/ui/views/location_bar/location_bar_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/location_bar_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 84 matching lines @@
 };
 
 static const int kNormalModeBackgroundImages[] = {
   IDR_LOCATIONBG_L,
   IDR_LOCATIONBG_C,
   IDR_LOCATIONBG_R,
 };
 
 // LocationBarView -----------------------------------------------------------
 
-LocationBarView::LocationBarView(Profile* profile,
-                                 Browser* browser,
+LocationBarView::LocationBarView(Browser* browser,
                                  ToolbarModel* model,
                                  Delegate* delegate,
                                  Mode mode)
-    : profile_(profile),
-      browser_(browser),
+    : browser_(browser),
       model_(model),
       delegate_(delegate),
       disposition_(CURRENT_TAB),
       transition_(PageTransition::LINK),
       location_icon_view_(NULL),
       ev_bubble_view_(NULL),
       location_entry_view_(NULL),
       selected_keyword_view_(NULL),
 #if defined(OS_WIN)
       suggested_text_view_(NULL),
 #endif
       keyword_hint_view_(NULL),
       star_view_(NULL),
       mode_(mode),
       show_focus_rect_(false),
       bubble_type_(FirstRun::MINIMAL_BUBBLE),
       template_url_service_(NULL),
       animation_offset_(0) {
-  DCHECK(profile_);
   set_id(VIEW_ID_LOCATION_BAR);
   set_focusable(true);
 
   if (mode_ == NORMAL)
     painter_.reset(new views::HorizontalPainter(kNormalModeBackgroundImages));
 
   edit_bookmarks_enabled_.Init(prefs::kEditBookmarksEnabled,
-                               profile_->GetPrefs(), this);
+                               browser_->profile()->GetPrefs(), this);
 }
 
 LocationBarView::~LocationBarView() {
   if (template_url_service_)
     template_url_service_->RemoveObserver(this);
 }
 
 void LocationBarView::Init() {
   if (mode_ == POPUP) {
     font_ = ResourceBundle::GetSharedInstance().GetFont(
@@ skipping 17 matching lines @@
 
   ev_bubble_view_ =
       new EVBubbleView(kEVBubbleBackgroundImages, IDR_OMNIBOX_HTTPS_VALID,
                        GetColor(ToolbarModel::EV_SECURE, SECURITY_TEXT), this);
   AddChildView(ev_bubble_view_);
   ev_bubble_view_->SetVisible(false);
   ev_bubble_view_->set_drag_controller(this);
 
   // URL edit field.
   // View container for URL edit field.
+  Profile* profile = browser_->profile();
 #if defined(OS_WIN)
   if (views::Widget::IsPureViews()) {
-    OmniboxViewViews* omnibox_view =
-        new OmniboxViewViews(this, model_, profile_,
-                             browser_->command_updater(), mode_ == POPUP, this);
+    OmniboxViewViews* omnibox_view = new OmniboxViewViews(this, model_, profile,
+        browser_->command_updater(), mode_ == POPUP, this);
     omnibox_view->Init();
     location_entry_.reset(omnibox_view);
   } else {
     location_entry_.reset(new OmniboxViewWin(font_, this, model_, this,
-        GetWidget()->GetNativeView(), profile_, browser_->command_updater(),
+        GetWidget()->GetNativeView(), browser_->command_updater(),
         mode_ == POPUP, this));
   }
 #else
-  location_entry_.reset(OmniboxViewGtk::Create(this, model_, profile_,
+  location_entry_.reset(OmniboxViewGtk::Create(this, model_, profile,
       browser_->command_updater(), mode_ == POPUP, this));
 #endif
 
   location_entry_view_ = location_entry_->AddToView(this);
   location_entry_view_->set_id(VIEW_ID_AUTOCOMPLETE);
 
   selected_keyword_view_ = new SelectedKeywordView(
       kSelectedKeywordBackgroundImages, IDR_KEYWORD_SEARCH_MAGNIFIER,
-      GetColor(ToolbarModel::NONE, TEXT), profile_),
+      GetColor(ToolbarModel::NONE, TEXT), profile);
   AddChildView(selected_keyword_view_);
   selected_keyword_view_->SetFont(font_);
   selected_keyword_view_->SetVisible(false);
 
   SkColor dimmed_text = GetColor(ToolbarModel::NONE, DEEMPHASIZED_TEXT);
 
-  keyword_hint_view_ = new KeywordHintView(profile_);
+  keyword_hint_view_ = new KeywordHintView(profile);
   AddChildView(keyword_hint_view_);
   keyword_hint_view_->SetVisible(false);
   keyword_hint_view_->SetFont(font_);
   keyword_hint_view_->SetColor(dimmed_text);
 
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
-    ContentSettingImageView* content_blocked_view = new ContentSettingImageView(
-        static_cast<ContentSettingsType>(i), this, profile_);
+    ContentSettingImageView* content_blocked_view =
+        new ContentSettingImageView(static_cast<ContentSettingsType>(i), this);
     content_setting_views_.push_back(content_blocked_view);
     AddChildView(content_blocked_view);
     content_blocked_view->SetVisible(false);
   }
 
   // The star is not visible in popups and in the app launcher.
   if (browser_defaults::bookmarks_enabled && (mode_ == NORMAL)) {
     star_view_ = new StarView(browser_->command_updater());
     AddChildView(star_view_);
     star_view_->SetVisible(true);
@@ skipping 116 matching lines @@
   }
 }
 
 void LocationBarView::OnFocus() {
   // Focus the location entry native view.
   location_entry_->SetFocus();
   GetWidget()->NotifyAccessibilityEvent(
       this, ui::AccessibilityTypes::EVENT_FOCUS, true);
 }
 
-void LocationBarView::SetProfile(Profile* profile) {
-  DCHECK(profile);
-  if (profile_ != profile) {
-    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);
-  }
-}
-
 void LocationBarView::SetPreviewEnabledPageAction(ExtensionAction* page_action,
                                                   bool preview_enabled) {
   if (mode_ != NORMAL)
     return;
 
   DCHECK(page_action);
   TabContents* contents = GetTabContentsFromDelegate(delegate_);
 
   RefreshPageActionViews();
   PageActionWithBadgeView* page_action_view =
@@ skipping 26 matching lines @@
 }
 
 void LocationBarView::ShowStarBubble(const GURL& url, bool newly_bookmarked) {
   gfx::Rect screen_bounds(star_view_->GetImageBounds());
   // Compensate for some built-in padding in the Star image.
   screen_bounds.Inset(1, 1, 1, 2);
   gfx::Point origin(screen_bounds.origin());
   views::View::ConvertPointToScreen(star_view_, &origin);
   screen_bounds.set_origin(origin);
   browser::ShowBookmarkBubbleView(GetWidget(), screen_bounds, star_view_,
-                                  profile_, url, newly_bookmarked);
+                                  browser_->profile(), url, newly_bookmarked);
 }
 
 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 145 matching lines @@
   if (max_edit_width < 0)
     return;
   const int available_width = AvailableWidth(max_edit_width);
 
   const bool show_keyword_hint = !keyword.empty() && is_keyword_hint;
   selected_keyword_view_->SetVisible(show_selected_keyword);
   keyword_hint_view_->SetVisible(show_keyword_hint);
   if (show_selected_keyword) {
     if (selected_keyword_view_->keyword() != keyword) {
       selected_keyword_view_->SetKeyword(keyword);
+      Profile* profile = browser_->profile();
       const TemplateURL* template_url =
-          TemplateURLServiceFactory::GetForProfile(profile_)->
+          TemplateURLServiceFactory::GetForProfile(profile)->
           GetTemplateURLForKeyword(keyword);
       if (template_url && template_url->IsExtensionKeyword()) {
-        const SkBitmap& bitmap = profile_->GetExtensionService()->
-            GetOmniboxIcon(template_url->GetExtensionId());
+        const SkBitmap& bitmap = profile->GetExtensionService()->GetOmniboxIcon(
+            template_url->GetExtensionId());
         selected_keyword_view_->SetImage(bitmap);
         selected_keyword_view_->set_is_extension_icon(true);
       } else {
         selected_keyword_view_->SetImage(*ResourceBundle::GetSharedInstance().
             GetBitmapNamed(IDR_OMNIBOX_SEARCH));
         selected_keyword_view_->set_is_extension_icon(false);
       }
     }
   } else if (show_keyword_hint) {
     if (keyword_hint_view_->keyword() != keyword)
@@ skipping 339 matching lines @@
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i)
     RemoveChildView(*i);
   STLDeleteElements(&page_action_views_);
 }
 
 void LocationBarView::RefreshPageActionViews() {
   if (mode_ != NORMAL)
     return;
 
-  ExtensionService* service = profile_->GetExtensionService();
+  ExtensionService* service = browser_->profile()->GetExtensionService();
   if (!service)
     return;
 
   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)->IsVisible();
 
   // Remember the previous visibility of the page actions so that we can
   // notify when this changes.
   std::vector<ExtensionAction*> page_actions;
   for (size_t i = 0; i < service->extensions()->size(); ++i) {
     if (service->extensions()->at(i)->page_action())
       page_actions.push_back(service->extensions()->at(i)->page_action());
   }
 
   // On startup we sometimes haven't loaded any extensions. This makes sure
   // we catch up when the extensions (and any page actions) load.
   if (page_actions.size() != page_action_views_.size()) {
     DeletePageActionViews();  // Delete the old views (if any).
 
     page_action_views_.resize(page_actions.size());
 
     // 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]));
+          new PageActionImageView(this, page_actions[i]));
       page_action_views_[i]->SetVisible(false);
       AddChildViewAt(page_action_views_[i], GetIndexOf(star_view_));
     }
   }
 
   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());
@@ skipping 35 matching lines @@
       IDR_OMNIBOX_HTTP)->width() + kItemPadding;
   const int kYOffset = -(kVerticalEdgeThickness + 2);
   gfx::Point origin(location_entry_view_->bounds().x() + kXOffset,
                     y() + height() + kYOffset);
   // 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);
-  FirstRunBubble::Show(profile_, GetWidget(), gfx::Rect(origin, gfx::Size()),
-                       BubbleBorder::TOP_LEFT, bubble_type);
+  FirstRunBubble::Show(browser_->profile(), GetWidget(),
+      gfx::Rect(origin, gfx::Size()), BubbleBorder::TOP_LEFT, bubble_type);
 #endif
 }
 
 std::string LocationBarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool LocationBarView::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& event) {
 #if defined(OS_WIN)
@@ skipping 72 matching lines @@
                                           const gfx::Point& p) {
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, LocationBar implementation:
 
 void LocationBarView::ShowFirstRunBubble(FirstRun::BubbleType bubble_type) {
   // Wait until search engines have loaded to show the first run bubble.
   TemplateURLService* url_service =
-      TemplateURLServiceFactory::GetForProfile(profile_);
+      TemplateURLServiceFactory::GetForProfile(browser_->profile());
   if (!url_service->loaded()) {
     bubble_type_ = bubble_type;
     template_url_service_ = url_service;
     template_url_service_->AddObserver(this);
     template_url_service_->Load();
     return;
   }
   ShowFirstRunBubbleInternal(bubble_type);
 }
 
@@ skipping 125 matching lines @@
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->GetText().empty();
 }
 
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   CHECK(!views::Widget::IsPureViews());
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif