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

Side by Side Diff: chrome/browser/chromeos/options/wimax_config_view.cc

Issue 762633002: Use NetworkConnectionObserver to trigger connect failure notifications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 11 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 unified diff | Download patch
OLDNEW
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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 void WimaxConfigView::UpdateDialogButtons() { 93 void WimaxConfigView::UpdateDialogButtons() {
94 parent_->GetDialogClientView()->UpdateDialogButtons(); 94 parent_->GetDialogClientView()->UpdateDialogButtons();
95 } 95 }
96 96
97 void WimaxConfigView::UpdateErrorLabel() { 97 void WimaxConfigView::UpdateErrorLabel() {
98 base::string16 error_msg; 98 base::string16 error_msg;
99 if (!service_path_.empty()) { 99 if (!service_path_.empty()) {
100 const NetworkState* wimax = NetworkHandler::Get()->network_state_handler()-> 100 const NetworkState* wimax = NetworkHandler::Get()->network_state_handler()->
101 GetNetworkState(service_path_); 101 GetNetworkState(service_path_);
102 if (wimax && wimax->connection_state() == shill::kStateFailure) 102 if (wimax && wimax->connection_state() == shill::kStateFailure)
103 error_msg = ui::NetworkConnect::Get()->GetErrorString( 103 error_msg = ui::NetworkConnect::Get()->GetShillErrorString(
104 wimax->last_error(), wimax->path()); 104 wimax->last_error(), wimax->path());
105 } 105 }
106 if (!error_msg.empty()) { 106 if (!error_msg.empty()) {
107 error_label_->SetText(error_msg); 107 error_label_->SetText(error_msg);
108 error_label_->SetVisible(true); 108 error_label_->SetVisible(true);
109 } else { 109 } else {
110 error_label_->SetVisible(false); 110 error_label_->SetVisible(false);
111 } 111 }
112 } 112 }
113 113
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 } 373 }
374 } 374 }
375 375
376 void WimaxConfigView::InitFocus() { 376 void WimaxConfigView::InitFocus() {
377 views::View* view_to_focus = GetInitiallyFocusedView(); 377 views::View* view_to_focus = GetInitiallyFocusedView();
378 if (view_to_focus) 378 if (view_to_focus)
379 view_to_focus->RequestFocus(); 379 view_to_focus->RequestFocus();
380 } 380 }
381 381
382 } // namespace chromeos 382 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698