Add desktop type context to most existing instances of FindTabbedBrowser.

chrome/browser/chromeos/options/network_config_view.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/chromeos/options/network_config_view.h"
 
 #include <algorithm>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/options/vpn_config_view.h"
 #include "chrome/browser/chromeos/options/wifi_config_view.h"
 #include "chrome/browser/chromeos/options/wimax_config_view.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 gfx::NativeWindow GetDialogParent() {
   if (chromeos::BaseLoginDisplayHost::default_host()) {
     return chromeos::BaseLoginDisplayHost::default_host()->GetNativeWindow();
   } else {
     Browser* browser = browser::FindTabbedBrowser(
-        ProfileManager::GetDefaultProfileOrOffTheRecord(), true);
+        ProfileManager::GetDefaultProfileOrOffTheRecord(),
+        true,
+        chrome::HOST_DESKTOP_TYPE_ASH);
     if (browser)
       return browser->window()->GetNativeWindow();
   }
   return NULL;
 }
 
 // Avoid global static initializer.
 chromeos::NetworkConfigView** GetActiveDialogPointer() {
   static chromeos::NetworkConfigView* active_dialog = NULL;
   return &active_dialog;
@@ skipping 265 matching lines @@
   image_view_ = new views::ImageView();
   // Disable |image_view_| so mouse events propagate to the parent.
   image_view_->SetEnabled(false);
   image_view_->SetImage(gray_image_);
   image_view_->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
   AddChildView(image_view_);
 }
 
 }  // namespace chromeos