Make NetworkProfileBubble not use BrowserList::GetLastActive() as much. Instead pass it a profile a…

chrome/browser/ui/views/network_profile_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/network_profile_bubble.h"
 
 #include <wtsapi32.h>
 // Make sure we link the wtsapi lib file in.
 #pragma comment(lib, "wtsapi32.lib")
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"

[sky, 2012/05/23 00:03:10]

Can you remove this include now?

 #include "chrome/browser/ui/network_profile_bubble_prefs.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 45 matching lines @@
                             event,
                             METRIC_NETWORKED_PROFILE_CHECK_SIZE);
 }
 
 // Implementation of BrowserList::Observer used to wait for a browser window.
 class BrowserListObserver : public BrowserList::Observer {
  private:
   virtual ~BrowserListObserver();
 
   // Overridden from BrowserList::Observer:
-  virtual void OnBrowserAdded(const Browser* browser) OVERRIDE;
-  virtual void OnBrowserRemoved(const Browser* browser) OVERRIDE;
-  virtual void OnBrowserSetLastActive(const Browser* browser) OVERRIDE;
+  virtual void OnBrowserAdded(Browser* browser) OVERRIDE;
+  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
+  virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE;
 };
 
 BrowserListObserver::~BrowserListObserver() {
 }
 
-void BrowserListObserver::OnBrowserAdded(const Browser* browser) {
+void BrowserListObserver::OnBrowserAdded(Browser* browser) {
 }
 
-void BrowserListObserver::OnBrowserRemoved(const Browser* browser) {
+void BrowserListObserver::OnBrowserRemoved(Browser* browser) {
 }
 
-void BrowserListObserver::OnBrowserSetLastActive(const Browser* browser) {
+void BrowserListObserver::OnBrowserSetLastActive(Browser* browser) {
   NetworkProfileBubble::ShowNotification(browser);
   // No need to observe anymore.
   BrowserList::RemoveObserver(this);
   delete this;
 }
 
 }  // namespace
 
 // static
 bool NetworkProfileBubble::notification_shown_ = false;
@@ skipping 73 matching lines @@
       base::Time::Now() - base::Time::FromTimeT(last_check);
   if (time_since_last_check.InDays() > kSilenceDurationDays) {
     prefs->SetInteger(prefs::kNetworkProfileWarningsLeft,
                       browser::kMaxWarnings);
     return !notification_shown_;
   }
   return false;
 }
 
 // static
-void NetworkProfileBubble::ShowNotification(const Browser* browser) {
+void NetworkProfileBubble::ShowNotification(Browser* browser) {
   views::View* anchor = NULL;
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   if (browser_view && browser_view->GetToolbarView())
     anchor = browser_view->GetToolbarView()->app_menu();
-  NetworkProfileBubble* bubble = new NetworkProfileBubble(anchor);
+  NetworkProfileBubble* bubble =
+      new NetworkProfileBubble(anchor, browser, browser->profile());
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->Show();
   notification_shown_ = true;
 
   // Mark the time of the last bubble and reduce the number of warnings left
   // before the next silence period starts.
   PrefService* prefs = browser->profile()->GetPrefs();
   prefs->SetInt64(prefs::kNetworkProfileLastWarningTime,
                   base::Time::Now().ToTimeT());
   int left_warnings = prefs->GetInteger(prefs::kNetworkProfileWarningsLeft);
   if (left_warnings > 0)
     prefs->SetInteger(prefs::kNetworkProfileWarningsLeft, --left_warnings);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkProfileBubble, private:
 
-NetworkProfileBubble::NetworkProfileBubble(views::View* anchor)
-    : BubbleDelegateView(anchor, views::BubbleBorder::TOP_RIGHT) {
+NetworkProfileBubble::NetworkProfileBubble(views::View* anchor,
+                                           content::PageNavigator* navigator,
+                                           Profile* profile)
+    : BubbleDelegateView(anchor, views::BubbleBorder::TOP_RIGHT),
+      navigator_(navigator),
+      profile_(profile) {
 }
 
 NetworkProfileBubble::~NetworkProfileBubble() {
 }
 
 void NetworkProfileBubble::Init() {
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   layout->SetInsets(0, kInset, kInset, kInset);
   SetLayoutManager(layout);
 
@@ skipping 33 matching lines @@
 
 gfx::Rect NetworkProfileBubble::GetAnchorRect() {
   // Compensate for padding in anchor.
   gfx::Rect rect(BubbleDelegateView::GetAnchorRect());
   rect.Inset(0, anchor_view() ? kAnchorVerticalInset : 0);
   return rect;
 }
 
 void NetworkProfileBubble::LinkClicked(views::Link* source, int event_flags) {
   RecordUmaEvent(METRIC_LEARN_MORE_CLICKED);
-  Browser* browser = BrowserList::GetLastActive();
-  if (browser) {
-    WindowOpenDisposition disposition =
-        event_utils::DispositionFromEventFlags(event_flags);
-    content::OpenURLParams params(
-        GURL("https://sites.google.com/a/chromium.org/dev/administrators/"
-             "common-problems-and-solutions#network_profile"),
-        content::Referrer(),
-        disposition == CURRENT_TAB ? NEW_FOREGROUND_TAB : disposition,
-        content::PAGE_TRANSITION_LINK, false);
-    browser->OpenURL(params);
-    // If the user interacted with the bubble we don't reduce the number of
-    // warnings left.
-    PrefService* prefs = browser->profile()->GetPrefs();
-    int left_warnings = prefs->GetInteger(prefs::kNetworkProfileWarningsLeft);
-    prefs->SetInteger(prefs::kNetworkProfileWarningsLeft, ++left_warnings);
-  }
+  WindowOpenDisposition disposition =
+      event_utils::DispositionFromEventFlags(event_flags);
+  content::OpenURLParams params(
+      GURL("https://sites.google.com/a/chromium.org/dev/administrators/"
+            "common-problems-and-solutions#network_profile"),
+      content::Referrer(),
+      disposition == CURRENT_TAB ? NEW_FOREGROUND_TAB : disposition,
+      content::PAGE_TRANSITION_LINK, false);
+  navigator_->OpenURL(params);
+
+  // If the user interacted with the bubble we don't reduce the number of
+  // warnings left.
+  PrefService* prefs = profile_->GetPrefs();
+  int left_warnings = prefs->GetInteger(prefs::kNetworkProfileWarningsLeft);
+  prefs->SetInteger(prefs::kNetworkProfileWarningsLeft, ++left_warnings);
   GetWidget()->Close();
 }
 
 void NetworkProfileBubble::ButtonPressed(views::Button* sender,
                                          const views::Event& event) {
   RecordUmaEvent(METRIC_ACKNOWLEDGED);
 
   GetWidget()->Close();
 }
 
 // static
 void NetworkProfileBubble::NotifyNetworkProfileDetected() {
   if (BrowserList::GetLastActive() != NULL)
     ShowNotification(BrowserList::GetLastActive());
   else
     BrowserList::AddObserver(new BrowserListObserver());
 }