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

Unified Diff: chrome/browser/chromeos/options/network_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/network_config_view.cc
diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc
index b48a60a3ccf7a6b2611ca338631d21fe8d7941a3..f5aa05e38135f802c89e2e017dd75e14b976bef8 100644
--- a/chrome/browser/chromeos/options/network_config_view.cc
+++ b/chrome/browser/chromeos/options/network_config_view.cc
@@ -13,19 +13,24 @@
#include "grit/locale_settings.h"
#include "views/grid_layout.h"
#include "views/standard_layout.h"
+#include "views/widget/widget_gtk.h"
#include "views/window/window.h"
+using views::WidgetGtk;
+
namespace chromeos {
NetworkConfigView::NetworkConfigView(EthernetNetwork ethernet)
- : flags_(FLAG_ETHERNET | FLAG_SHOW_IPCONFIG),
+ : browser_mode_(true),
+ flags_(FLAG_ETHERNET | FLAG_SHOW_IPCONFIG),
ethernet_(ethernet),
wificonfig_view_(NULL),
ipconfig_view_(NULL) {
}
NetworkConfigView::NetworkConfigView(WifiNetwork wifi, bool login_only)
- : flags_(FLAG_WIFI),
+ : browser_mode_(true),
+ flags_(FLAG_WIFI),
wifi_(wifi),
wificonfig_view_(NULL),
ipconfig_view_(NULL) {
@@ -36,18 +41,24 @@ NetworkConfigView::NetworkConfigView(WifiNetwork wifi, bool login_only)
}
NetworkConfigView::NetworkConfigView(CellularNetwork cellular)
- : flags_(FLAG_CELLULAR | FLAG_SHOW_IPCONFIG),
+ : browser_mode_(true),
+ flags_(FLAG_CELLULAR | FLAG_SHOW_IPCONFIG),
cellular_(cellular),
wificonfig_view_(NULL),
ipconfig_view_(NULL) {
}
NetworkConfigView::NetworkConfigView()
- : flags_(FLAG_WIFI | FLAG_LOGIN_ONLY | FLAG_OTHER_NETWORK),
+ : browser_mode_(true),
+ flags_(FLAG_WIFI | FLAG_LOGIN_ONLY | FLAG_OTHER_NETWORK),
wificonfig_view_(NULL),
ipconfig_view_(NULL) {
}
+gfx::NativeWindow NetworkConfigView::GetNativeWindow() const {
+ return GTK_WINDOW(static_cast<WidgetGtk*>(GetWidget())->GetNativeView());
+}
+
std::wstring NetworkConfigView::GetDialogButtonLabel(
MessageBoxFlags::DialogButton button) const {
if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.h ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698