Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5718)

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

Issue 8834011: [cros] Postpone call to GetNativeWindow() in NetworkDropdown till it's really needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
index 4a84eb98597a8e6480d7e9596dc7b77be90681b0..d931d024955d93a99b93a44d0a36769bdfa46360 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
@@ -8,6 +8,7 @@
#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"
@@ -93,10 +94,8 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) {
// 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(
@@ -123,7 +122,7 @@ views::MenuButton* NetworkDropdown::GetMenuButton() {
}
gfx::NativeWindow NetworkDropdown::GetNativeWindow() const {
- return parent_window_;
+ return BaseLoginDisplayHost::default_host()->GetNativeWindow();
}
void NetworkDropdown::OpenButtonOptions() {

Powered by Google App Engine
This is Rietveld 408576698