Add desktop type context to most existing instances of FindTabbedBrowser.

chrome/browser/protector/protector_service.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/protector_service.h"
 
 #include "base/logging.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/protector/composite_settings_change.h"
 #include "chrome/browser/protector/keys.h"
 #include "chrome/browser/protector/protected_prefs_watcher.h"
 #include "chrome/browser/protector/protector_utils.h"
 #include "chrome/browser/protector/settings_change_global_error.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_source.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 
 namespace protector {
 
 namespace {
 
@@ skipping 51 matching lines @@
     // GlobalError instance will be created for the composite change.
     item_to_merge_with->error->RemoveFromProfile();
   } else if (change->IsUserVisible()) {
     Item new_item;
     SettingsChangeGlobalError* error =
         new SettingsChangeGlobalError(change_ptr.get(), this);
     new_item.error.reset(error);
     new_item.change.reset(change_ptr.release());
     items_.push_back(new_item);
     // Do not show the bubble immediately if another one is active.
-    error->AddToProfile(profile_, !has_active_change_);
+    // TODO(robertshield): Add desktop context to protector, crbug.com/153771
+    error->AddToProfile(profile_, !has_active_change_,
+                        chrome::HOST_DESKTOP_TYPE_NATIVE);
     has_active_change_ = true;
   } else {
     VLOG(1) << "Not showing a change because it's not user-visible.";
   }
 }
 
 bool ProtectorService::IsShowingChange() const {
   return !items_.empty();
 }
 
@@ skipping 71 matching lines @@
                                       MatchItemByError(error));
   DCHECK(item != items_.end());
 
   if (item->was_merged) {
     bool show_new_error = !has_active_change_ || item->show_when_merged;
     item->was_merged = false;
     item->show_when_merged = false;
     // Item was merged with another change instance and error has been removed,
     // create a new one for the composite change.
     item->error.reset(new SettingsChangeGlobalError(item->change.get(), this));
-    item->error->AddToProfile(profile_, show_new_error);
+    // TODO(robertshield): Add desktop context to protector, crbug.com/153771
+    item->error->AddToProfile(profile_, show_new_error,
+                              chrome::HOST_DESKTOP_TYPE_NATIVE);
     has_active_change_ = true;
     return;
   }
 
   items_.erase(item);
 
   // If no other change is shown and there are changes that haven't been shown
   // yet, show the first one.
   if (!has_active_change_) {
     for (item = items_.begin(); item != items_.end(); ++item) {
       if (!item->error->HasShownBubbleView()) {
-        item->error->ShowBubble();
+        // TODO(robertshield): Add desktop context to protector,
+        // crbug.com/153771
+        item->error->ShowBubble(chrome::HOST_DESKTOP_TYPE_NATIVE);
         has_active_change_ = true;
         return;
       }
     }
   }
 }
 
 BaseSettingChange* ProtectorService::GetLastChange() {
   return items_.empty() ? NULL : items_.back().change.get();
 }
@@ skipping 18 matching lines @@
 ProtectorService::MatchItemByError::MatchItemByError(
     const SettingsChangeGlobalError* other) : other_(other) {
 }
 
 bool ProtectorService::MatchItemByError::operator()(
     const ProtectorService::Item& item) {
   return other_ == item.error.get();
 }
 
 }  // namespace protector