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

Unified Diff: chrome/browser/chromeos/status/network_menu_button.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/status/network_menu_button.cc
diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc
index aa9b046c6ed5b59b9d224c72035a583f3e2ff3b2..09c84f3ceaf74fc6b4888e2c5bb4dc6aa887832d 100644
--- a/chrome/browser/chromeos/status/network_menu_button.cc
+++ b/chrome/browser/chromeos/status/network_menu_button.cc
@@ -100,6 +100,7 @@ void NetworkMenuButton::ActivatedAt(int index) {
cros->EnableOfflineMode(!cros->offline_mode());
} else if (flags & FLAG_OTHER_NETWORK) {
NetworkConfigView* view = new NetworkConfigView();
+ view->set_browser_mode(host_->IsBrowserMode());
views::Window* window = views::Window::CreateChromeWindow(
host_->GetNativeWindow(), gfx::Rect(), view);
window->SetIsAlwaysOnTop(true);
@@ -108,6 +109,7 @@ void NetworkMenuButton::ActivatedAt(int index) {
} else if (flags & FLAG_ETHERNET) {
if (cros->ethernet_connected()) {
NetworkConfigView* view = new NetworkConfigView(cros->ethernet_network());
+ view->set_browser_mode(host_->IsBrowserMode());
views::Window* window = views::Window::CreateChromeWindow(
host_->GetNativeWindow(), gfx::Rect(), view);
window->SetIsAlwaysOnTop(true);
@@ -121,6 +123,7 @@ void NetworkMenuButton::ActivatedAt(int index) {
if (wifi.name() == cros->wifi_name()) {
if (cros->wifi_connected()) {
NetworkConfigView* view = new NetworkConfigView(wifi, false);
+ view->set_browser_mode(host_->IsBrowserMode());
views::Window* window = views::Window::CreateChromeWindow(
host_->GetNativeWindow(), gfx::Rect(), view);
window->SetIsAlwaysOnTop(true);
@@ -133,6 +136,7 @@ void NetworkMenuButton::ActivatedAt(int index) {
cros->ConnectToWifiNetwork(wifi, string16(), string16(), string16());
} else {
NetworkConfigView* view = new NetworkConfigView(wifi, true);
+ view->set_browser_mode(host_->IsBrowserMode());
views::Window* window = views::Window::CreateChromeWindow(
host_->GetNativeWindow(), gfx::Rect(), view);
window->SetIsAlwaysOnTop(true);
@@ -148,6 +152,7 @@ void NetworkMenuButton::ActivatedAt(int index) {
if (cellular.name() == cros->cellular_name()) {
if (cros->cellular_connected()) {
NetworkConfigView* view = new NetworkConfigView(cellular);
+ view->set_browser_mode(host_->IsBrowserMode());
views::Window* window = views::Window::CreateChromeWindow(
host_->GetNativeWindow(), gfx::Rect(), view);
window->SetIsAlwaysOnTop(true);
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.cc ('k') | chrome/browser/chromeos/status/status_area_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698