views: Pass only Browser pointer to FirstRunBubble.

chrome/browser/ui/views/first_run_bubble.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/first_run_bubble.h"
 
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/search_engines/util.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 const int kAnchorVerticalInset = 5;
 const int kTopInset = 1;
 const int kLeftInset = 2;
 const int kBottomInset = 7;
 const int kRightInset = 2;
 }  // namespace
 
 namespace first_run {
-  void ShowFirstRunDialog(Profile* profile) {}
+void ShowFirstRunDialog(Profile* profile) {}
 }  // namespace first_run
 
 // static
 FirstRunBubble* FirstRunBubble::ShowBubble(Browser* browser,
-                                           Profile* profile,
                                            views::View* anchor_view) {
   first_run::LogFirstRunMetric(first_run::FIRST_RUN_BUBBLE_SHOWN);
 
-  FirstRunBubble* delegate = new FirstRunBubble(browser, profile, anchor_view);
+  FirstRunBubble* delegate = new FirstRunBubble(browser, anchor_view);
   views::BubbleDelegateView::CreateBubble(delegate);
   delegate->StartFade(true);
   return delegate;
 }
 
 void FirstRunBubble::Init() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const gfx::Font& original_font = rb.GetFont(ui::ResourceBundle::MediumFont);
 
+  string16 search_engine_name;
+  if (browser_)
+    search_engine_name = GetDefaultSearchEngineName(browser_->profile());
+
   views::Label* title = new views::Label(l10n_util::GetStringFUTF16(
-      IDS_FR_BUBBLE_TITLE, GetDefaultSearchEngineName(profile_)));
+      IDS_FR_BUBBLE_TITLE, search_engine_name));

[Peter Kasting, 2012/08/11 22:52:40]

Nit: If you inline, you can avoid the temp above:

  views::Label* title = new views::Label(l10n_util::GetStringFUTF16(
      IDS_FR_BUBBLE_TITLE, browser_ ?
          GetDefaultSearchEngineName(browser_->profile()) : string16()));

   title->SetFont(original_font.DeriveFont(2, gfx::Font::BOLD));
 
   views::Link* change =
       new views::Link(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_CHANGE));
   change->SetFont(original_font);
   change->set_listener(this);
 
   views::Label* subtext =
       new views::Label(l10n_util::GetStringUTF16(IDS_FR_BUBBLE_SUBTEXT));
   subtext->SetFont(original_font);
@@ skipping 18 matching lines @@
   layout->AddView(subtext, columns->num_columns(), 1);
 }
 
 gfx::Rect FirstRunBubble::GetAnchorRect() {
   // Compensate for padding in anchor.
   gfx::Rect rect(BubbleDelegateView::GetAnchorRect());
   rect.Inset(0, anchor_view() ? kAnchorVerticalInset : 0);
   return rect;
 }
 
-FirstRunBubble::FirstRunBubble(Browser* browser,
-                               Profile* profile,
-                               views::View* anchor_view)
+FirstRunBubble::FirstRunBubble(Browser* browser, views::View* anchor_view)
     : views::BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_LEFT),
-      browser_(browser),
-      profile_(profile) {
+      browser_(browser) {
 }
 
 FirstRunBubble::~FirstRunBubble() {
 }
 
 void FirstRunBubble::LinkClicked(views::Link* source, int event_flags) {
   first_run::LogFirstRunMetric(first_run::FIRST_RUN_BUBBLE_CHANGE_INVOKED);
 
   GetWidget()->Close();
   if (browser_)
     chrome::ShowSearchEngineSettings(browser_);
 }