OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/options/internet_page_view.h" | 5 #include "chrome/browser/chromeos/options/internet_page_view.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "app/combobox_model.h" | 9 #include "app/combobox_model.h" |
10 #include "chrome/browser/chromeos/cros/cros_library.h" | 10 #include "chrome/browser/chromeos/cros/cros_library.h" |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 if (static_cast<int>(wifi_networks_.size()) > id) { | 366 if (static_cast<int>(wifi_networks_.size()) > id) { |
367 if (button == CONNECT_BUTTON) { | 367 if (button == CONNECT_BUTTON) { |
368 // Connect to wifi here. Open password page if appropriate. | 368 // Connect to wifi here. Open password page if appropriate. |
369 if (wifi_networks_[id].encrypted()) { | 369 if (wifi_networks_[id].encrypted()) { |
370 NetworkConfigView* view = | 370 NetworkConfigView* view = |
371 new NetworkConfigView(wifi_networks_[id], true); | 371 new NetworkConfigView(wifi_networks_[id], true); |
372 CreateModalPopup(view); | 372 CreateModalPopup(view); |
373 view->SetLoginTextfieldFocus(); | 373 view->SetLoginTextfieldFocus(); |
374 } else { | 374 } else { |
375 CrosLibrary::Get()->GetNetworkLibrary()->ConnectToWifiNetwork( | 375 CrosLibrary::Get()->GetNetworkLibrary()->ConnectToWifiNetwork( |
376 wifi_networks_[id], string16(), string16(), string16()); | 376 wifi_networks_[id], std::string(), std::string(), std::string()); |
377 } | 377 } |
378 } else if (button == DISCONNECT_BUTTON) { | 378 } else if (button == DISCONNECT_BUTTON) { |
379 CrosLibrary::Get()->GetNetworkLibrary()->DisconnectFromWirelessNetwork( | 379 CrosLibrary::Get()->GetNetworkLibrary()->DisconnectFromWirelessNetwork( |
380 wifi_networks_[id]); | 380 wifi_networks_[id]); |
381 } else { | 381 } else { |
382 CreateModalPopup(new NetworkConfigView(wifi_networks_[id], false)); | 382 CreateModalPopup(new NetworkConfigView(wifi_networks_[id], false)); |
383 } | 383 } |
384 } | 384 } |
385 } else { | 385 } else { |
386 NOTREACHED(); | 386 NOTREACHED(); |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
606 scroll_view_->SetBounds(GetLocalBounds(false)); | 606 scroll_view_->SetBounds(GetLocalBounds(false)); |
607 scroll_view_->Layout(); | 607 scroll_view_->Layout(); |
608 } | 608 } |
609 | 609 |
610 void InternetPageView::InitControlLayout() { | 610 void InternetPageView::InitControlLayout() { |
611 AddChildView(scroll_view_); | 611 AddChildView(scroll_view_); |
612 scroll_view_->SetContents(contents_view_); | 612 scroll_view_->SetContents(contents_view_); |
613 } | 613 } |
614 | 614 |
615 } // namespace chromeos | 615 } // namespace chromeos |
OLD | NEW |