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/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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 | 353 |
354 void NetworkSelectionView::ShowConnectingStatus(bool connecting, | 354 void NetworkSelectionView::ShowConnectingStatus(bool connecting, |
355 const string16& network_id) { | 355 const string16& network_id) { |
356 network_id_ = network_id; | 356 network_id_ = network_id; |
357 UpdateConnectingNetworkLabel(); | 357 UpdateConnectingNetworkLabel(); |
358 select_language_label_->SetVisible(!connecting); | 358 select_language_label_->SetVisible(!connecting); |
359 languages_menubutton_->SetVisible(!connecting); | 359 languages_menubutton_->SetVisible(!connecting); |
360 select_network_label_->SetVisible(!connecting); | 360 select_network_label_->SetVisible(!connecting); |
361 network_dropdown_->SetVisible(!connecting); | 361 network_dropdown_->SetVisible(!connecting); |
362 continue_button_->SetVisible(!connecting); | 362 continue_button_->SetVisible(!connecting); |
| 363 proxy_settings_link_->SetVisible(!connecting); |
363 connecting_network_label_->SetVisible(connecting); | 364 connecting_network_label_->SetVisible(connecting); |
364 InitLayout(); | 365 InitLayout(); |
365 Layout(); | 366 Layout(); |
366 if (connecting) { | 367 if (connecting) { |
367 throbber_->Start(); | 368 throbber_->Start(); |
368 network_dropdown_->CancelMenu(); | 369 network_dropdown_->CancelMenu(); |
369 } else { | 370 } else { |
370 throbber_->Stop(); | 371 throbber_->Stop(); |
371 } | 372 } |
372 } | 373 } |
(...skipping 10 matching lines...) Expand all Loading... |
383 bool NetworkSelectionView::IsContinueEnabled() const { | 384 bool NetworkSelectionView::IsContinueEnabled() const { |
384 return continue_button_ && continue_button_->IsEnabled(); | 385 return continue_button_ && continue_button_->IsEnabled(); |
385 } | 386 } |
386 | 387 |
387 //////////////////////////////////////////////////////////////////////////////// | 388 //////////////////////////////////////////////////////////////////////////////// |
388 // views::LinkController implementation: | 389 // views::LinkController implementation: |
389 | 390 |
390 void NetworkSelectionView::LinkActivated(views::Link* source, int) { | 391 void NetworkSelectionView::LinkActivated(views::Link* source, int) { |
391 if (source == proxy_settings_link_) { | 392 if (source == proxy_settings_link_) { |
392 if (!proxy_settings_dialog_.get()) { | 393 if (!proxy_settings_dialog_.get()) { |
393 static const char kProxySettingsURL[] = "chrome://options/proxy"; | 394 static const char kProxySettingsURL[] = "chrome://settings/proxy"; |
394 proxy_settings_dialog_.reset(new LoginHtmlDialog( | 395 proxy_settings_dialog_.reset(new LoginHtmlDialog( |
395 this, | 396 this, |
396 GetNativeWindow(), | 397 GetNativeWindow(), |
397 l10n_util::GetString(IDS_OPTIONS_PROXY_TAB_LABEL), | 398 l10n_util::GetString(IDS_OPTIONS_PROXY_TAB_LABEL), |
398 GURL(kProxySettingsURL))); | 399 GURL(kProxySettingsURL))); |
399 } | 400 } |
400 proxy_settings_dialog_->Show(); | 401 proxy_settings_dialog_->Show(); |
401 } | 402 } |
402 } | 403 } |
403 | 404 |
(...skipping 10 matching lines...) Expand all Loading... |
414 l10n_util::GetString(IDS_NETWORK_SELECTION_CONTINUE_BUTTON)); | 415 l10n_util::GetString(IDS_NETWORK_SELECTION_CONTINUE_BUTTON)); |
415 continue_button_->SetEnabled(is_continue_enabled); | 416 continue_button_->SetEnabled(is_continue_enabled); |
416 } | 417 } |
417 | 418 |
418 void NetworkSelectionView::UpdateConnectingNetworkLabel() { | 419 void NetworkSelectionView::UpdateConnectingNetworkLabel() { |
419 connecting_network_label_->SetText(l10n_util::GetStringF( | 420 connecting_network_label_->SetText(l10n_util::GetStringF( |
420 IDS_NETWORK_SELECTION_CONNECTING, UTF16ToWide(network_id_))); | 421 IDS_NETWORK_SELECTION_CONNECTING, UTF16ToWide(network_id_))); |
421 } | 422 } |
422 | 423 |
423 } // namespace chromeos | 424 } // namespace chromeos |
OLD | NEW |