[cros] Postpone call to GetNativeWindow() in NetworkDropdown till it's really needed.

chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

 // Copyright (c) 2011 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/webui/chromeos/login/network_dropdown.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "content/browser/webui/web_ui.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/font.h"
 
 namespace chromeos {
 
 // WebUI specific implementation of the NetworkMenu class.
 class NetworkMenuWebUI : public NetworkMenu {
@@ skipping 65 matching lines @@
     if (type == ui::MenuModel::TYPE_SUBMENU)
       item->Set("sub", ConvertMenuModel(model->GetSubmenuModelAt(i)));
     list->Append(item);
   }
   return list;
 }
 
 // NetworkDropdown -------------------------------------------------------------
 
 NetworkDropdown::NetworkDropdown(WebUI* web_ui,
-                                 gfx::NativeWindow parent_window,
                                  bool oobe)
-    : parent_window_(parent_window),
-      web_ui_(web_ui),
+    : web_ui_(web_ui),
       oobe_(oobe) {
   network_menu_.reset(new NetworkMenuWebUI(this, web_ui));
   network_icon_.reset(
       new NetworkMenuIcon(this, NetworkMenuIcon::DROPDOWN_MODE));
   CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this);
   Refresh();
 }
 
 NetworkDropdown::~NetworkDropdown() {
   CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
 }
 
 void NetworkDropdown::SetLastNetworkType(ConnectionType last_network_type) {
   network_icon_->set_last_network_type(last_network_type);
 }
 
 void NetworkDropdown::OnItemChosen(int id) {
   network_menu_->OnItemChosen(id);
 }
 
 views::MenuButton* NetworkDropdown::GetMenuButton() {
   NOTREACHED();
   return NULL;
 }
 
 gfx::NativeWindow NetworkDropdown::GetNativeWindow() const {
-  return parent_window_;
+  return BaseLoginDisplayHost::default_host()->GetNativeWindow();
 }
 
 void NetworkDropdown::OpenButtonOptions() {
   if (proxy_settings_dialog_.get() == NULL) {
     proxy_settings_dialog_.reset(
         new ProxySettingsDialog(this, GetNativeWindow()));
   }
   proxy_settings_dialog_->Show();
 }
 
@@ skipping 23 matching lines @@
   std::string icon_str =
       icon_bitmap.empty() ?
           std::string() : web_ui_util::GetImageDataUrl(icon_bitmap);
   base::StringValue title(text);
   base::StringValue icon(icon_str);
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
                                   title, icon);
 }
 
 }  // namespace chromeos