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

chrome/browser/managed_mode.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/managed_mode.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 79 matching lines @@
     SetInManagedMode(true);
     managed_profile_ = NULL;
     callback.Run(true);
     return;
   }
   callbacks_.push_back(callback);
   registrar_.Add(this, content::NOTIFICATION_APP_EXITING,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED,
                  content::NotificationService::AllSources());
-  for (std::set<const Browser*>::const_iterator i = browsers_to_close_.begin();
+  for (std::set<Browser*>::const_iterator i = browsers_to_close_.begin();
        i != browsers_to_close_.end(); ++i) {
     (*i)->window()->Close();
   }
 }
 
 // static
 void ManagedMode::LeaveManagedMode() {
   GetInstance()->LeaveManagedModeImpl();
 }
 
 void ManagedMode::LeaveManagedModeImpl() {
   bool confirmed = PlatformConfirmLeave();
   if (confirmed)
     SetInManagedMode(false);
 }
 
-void ManagedMode::OnBrowserAdded(const Browser* browser) {
+void ManagedMode::OnBrowserAdded(Browser* browser) {
   // Return early if we don't have any queued callbacks.
   if (callbacks_.empty())
     return;
 
   if (browser->profile()->GetOriginalProfile() != managed_profile_)
     FinalizeEnter(false);
 }
 
-void ManagedMode::OnBrowserRemoved(const Browser* browser) {
+void ManagedMode::OnBrowserRemoved(Browser* browser) {
   // Return early if we don't have any queued callbacks.
   if (callbacks_.empty())
     return;
 
   if (browser->profile()->GetOriginalProfile() == managed_profile_) {
     // Ignore closing browser windows that are in managed mode.
     return;
   }
   size_t count = browsers_to_close_.erase(browser);
   DCHECK_EQ(1u, count);
@@ skipping 63 matching lines @@
 void ManagedMode::SetInManagedMode(bool in_managed_mode) {
   g_browser_process->local_state()->SetBoolean(prefs::kInManagedMode,
                                                in_managed_mode);
   // This causes the avatar and the profile menu to get updated.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
       content::NotificationService::AllBrowserContextsAndSources(),
       content::NotificationService::NoDetails());
 }