OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/wimax_config_view.h" | 5 #include "chrome/browser/chromeos/options/wimax_config_view.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 void WimaxConfigView::UpdateDialogButtons() { | 94 void WimaxConfigView::UpdateDialogButtons() { |
95 parent_->GetDialogClientView()->UpdateDialogButtons(); | 95 parent_->GetDialogClientView()->UpdateDialogButtons(); |
96 } | 96 } |
97 | 97 |
98 void WimaxConfigView::UpdateErrorLabel() { | 98 void WimaxConfigView::UpdateErrorLabel() { |
99 base::string16 error_msg; | 99 base::string16 error_msg; |
100 if (!service_path_.empty()) { | 100 if (!service_path_.empty()) { |
101 const NetworkState* wimax = NetworkHandler::Get()->network_state_handler()-> | 101 const NetworkState* wimax = NetworkHandler::Get()->network_state_handler()-> |
102 GetNetworkState(service_path_); | 102 GetNetworkState(service_path_); |
103 if (wimax && wimax->connection_state() == shill::kStateFailure) | 103 if (wimax && wimax->connection_state() == shill::kStateFailure) |
104 error_msg = ui::NetworkConnect::Get()->GetErrorString( | 104 error_msg = ui::NetworkConnect::Get()->GetShillErrorString( |
105 wimax->last_error(), wimax->path()); | 105 wimax->last_error(), wimax->path()); |
106 } | 106 } |
107 if (!error_msg.empty()) { | 107 if (!error_msg.empty()) { |
108 error_label_->SetText(error_msg); | 108 error_label_->SetText(error_msg); |
109 error_label_->SetVisible(true); | 109 error_label_->SetVisible(true); |
110 } else { | 110 } else { |
111 error_label_->SetVisible(false); | 111 error_label_->SetVisible(false); |
112 } | 112 } |
113 } | 113 } |
114 | 114 |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
374 } | 374 } |
375 } | 375 } |
376 | 376 |
377 void WimaxConfigView::InitFocus() { | 377 void WimaxConfigView::InitFocus() { |
378 views::View* view_to_focus = GetInitiallyFocusedView(); | 378 views::View* view_to_focus = GetInitiallyFocusedView(); |
379 if (view_to_focus) | 379 if (view_to_focus) |
380 view_to_focus->RequestFocus(); | 380 view_to_focus->RequestFocus(); |
381 } | 381 } |
382 | 382 |
383 } // namespace chromeos | 383 } // namespace chromeos |
OLD | NEW |