Add desktop type context to most existing instances of FindTabbedBrowser.

chrome/browser/protector/settings_change_global_error.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/protector/settings_change_global_error.h"
 
 #include <bitset>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 51 matching lines @@
   DCHECK(menu_id_ >= 0) << "Out of command IDs for SettingsChangeGlobalError";
 }
 
 SettingsChangeGlobalError::~SettingsChangeGlobalError() {
   if (profile_)
     RemoveFromProfile();
   if (menu_id_ >= 0)
     menu_ids.Get().reset(menu_id_ - IDC_SHOW_SETTINGS_CHANGE_FIRST);
 }
 
-void SettingsChangeGlobalError::AddToProfile(Profile* profile,
-                                             bool show_bubble) {
+void SettingsChangeGlobalError::AddToProfile(
+    Profile* profile,
+    bool show_bubble,
+    chrome::HostDesktopType desktop_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   profile_ = profile;
   GlobalErrorServiceFactory::GetForProfile(profile_)->AddGlobalError(this);
   BrowserList::AddObserver(this);
   if (show_bubble) {
-    ShowBubble();
+    ShowBubble(desktop_type);
   } else {
     // Start inactivity timer.
     BrowserThread::PostDelayedTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&SettingsChangeGlobalError::OnInactiveTimeout,
                    weak_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(kMenuItemDisplayPeriodMs));
   }
 }
 
 void SettingsChangeGlobalError::RemoveFromProfile() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (profile_) {
     GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError(this);
     profile_ = NULL;
   }
   BrowserList::RemoveObserver(this);
   // This will delete |this|.
   delegate_->OnRemovedFromProfile(this);
 }
 
-void SettingsChangeGlobalError::ShowBubble() {
+void SettingsChangeGlobalError::ShowBubble(
+    chrome::HostDesktopType desktop_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile_);
-  Browser* browser = browser::FindTabbedBrowser(
-      profile_,
-      // match incognito
-      true);
+  Browser* browser = browser::FindTabbedBrowser(profile_, true, desktop_type);
   if (browser)
     ShowBubbleInBrowser(browser);
 }
 
 bool SettingsChangeGlobalError::HasBadge() {
   return true;
 }
 
 int SettingsChangeGlobalError::GetBadgeResourceID() {
   return change_->GetBadgeIconID();
@@ skipping 92 matching lines @@
     // A tabbed browser window got activated, show the error bubble again.
     // Calling ShowBubble() immediately from here does not always work because
     // the old browser window may still have focus.
     // Multiple posted ShowBubble() calls are fine since the first successful
     // one will invalidate all the weak pointers.
     // Note that ShowBubble() will display the bubble in the last active browser
     // (which may not be |browser| at the moment ShowBubble() is executed).
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&SettingsChangeGlobalError::ShowBubble,
-                   weak_factory_.GetWeakPtr()));
+                   weak_factory_.GetWeakPtr(),
+                   browser->host_desktop_type()));
   }
 }
 
 void SettingsChangeGlobalError::ShowBubbleInBrowser(Browser* browser) {
   show_on_browser_activation_ = false;
   // Cancel any previously posted tasks so that the global error
   // does not get removed on timeout while still showing the bubble.
   weak_factory_.InvalidateWeakPtrs();
   ShowBubbleView(browser);
 }
 
 void SettingsChangeGlobalError::OnInactiveTimeout() {
   delegate_->OnDecisionTimeout(this);
   RemoveFromProfile();
 }
 
 }  // namespace protector