| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/login/network_selection_view.h" | 5 #include "chrome/browser/chromeos/login/network_selection_view.h" |
| 6 | 6 |
| 7 #include <signal.h> | 7 #include <signal.h> |
| 8 #include <sys/types.h> | 8 #include <sys/types.h> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 proxy_settings_dialog_.reset(NULL); | 371 proxy_settings_dialog_.reset(NULL); |
| 372 | 372 |
| 373 Layout(); | 373 Layout(); |
| 374 SchedulePaint(); | 374 SchedulePaint(); |
| 375 } | 375 } |
| 376 | 376 |
| 377 //////////////////////////////////////////////////////////////////////////////// | 377 //////////////////////////////////////////////////////////////////////////////// |
| 378 // NetworkSelectionView, public: | 378 // NetworkSelectionView, public: |
| 379 | 379 |
| 380 gfx::NativeWindow NetworkSelectionView::GetNativeWindow() const { | 380 gfx::NativeWindow NetworkSelectionView::GetNativeWindow() const { |
| 381 return GTK_WINDOW(static_cast<WidgetGtk*>(GetWidget())->GetNativeView()); | 381 return |
| 382 GTK_WINDOW(static_cast<const WidgetGtk*>(GetWidget())->GetNativeView()); |
| 382 } | 383 } |
| 383 | 384 |
| 384 views::View* NetworkSelectionView::GetNetworkControlView() const { | 385 views::View* NetworkSelectionView::GetNetworkControlView() const { |
| 385 return network_dropdown_; | 386 return network_dropdown_; |
| 386 } | 387 } |
| 387 | 388 |
| 388 void NetworkSelectionView::ShowConnectingStatus(bool connecting, | 389 void NetworkSelectionView::ShowConnectingStatus(bool connecting, |
| 389 const string16& network_id) { | 390 const string16& network_id) { |
| 390 network_id_ = network_id; | 391 network_id_ = network_id; |
| 391 UpdateConnectingNetworkLabel(); | 392 UpdateConnectingNetworkLabel(); |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON))); | 450 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON))); |
| 450 continue_button_->SetEnabled(is_continue_enabled); | 451 continue_button_->SetEnabled(is_continue_enabled); |
| 451 } | 452 } |
| 452 | 453 |
| 453 void NetworkSelectionView::UpdateConnectingNetworkLabel() { | 454 void NetworkSelectionView::UpdateConnectingNetworkLabel() { |
| 454 connecting_network_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16( | 455 connecting_network_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16( |
| 455 IDS_NETWORK_SELECTION_CONNECTING, network_id_))); | 456 IDS_NETWORK_SELECTION_CONNECTING, network_id_))); |
| 456 } | 457 } |
| 457 | 458 |
| 458 } // namespace chromeos | 459 } // namespace chromeos |
| OLD | NEW |