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

Unified Diff: chrome/browser/chromeos/options/wifi_config_view.cc

Issue 2053001: Fix crash when opening "Select certificate file" in OOBE. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: added correct way to check for OOBE/login mode Created 10 years, 7 months 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/chromeos/options/wifi_config_view.cc
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index e360973786bf89320c806f0cda632c2c4629c314..2ca3fc3a6d71962af5b7818de7fa827d8ca5577a 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -87,9 +87,14 @@ void WifiConfigView::ButtonPressed(views::Button* sender,
passphrase_textfield_->SetPassword(!passphrase_textfield_->IsPassword());
} else if (sender == certificate_browse_button_) {
select_file_dialog_ = SelectFileDialog::Create(this);
+ select_file_dialog_->set_browser_mode(parent_->is_browser_mode());
select_file_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE,
string16(), FilePath(), NULL, 0,
- std::string(), NULL, NULL);
+ std::string(),
+ parent_->is_browser_mode() ?
+ NULL :
+ parent_->GetNativeWindow(),
+ NULL);
} else {
NOTREACHED();
}
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.cc ('k') | chrome/browser/chromeos/status/network_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698