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

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

Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Upload after merge Created 8 years, 3 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/string_util.h" 7 #include "base/string_util.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/chromeos/cros/cros_library.h" 10 #include "chrome/browser/chromeos/cros/cros_library.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 129 }
130 } else { 130 } else {
131 NOTREACHED(); 131 NOTREACHED();
132 } 132 }
133 } 133 }
134 134
135 bool WimaxConfigView::Login() { 135 bool WimaxConfigView::Login() {
136 NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary(); 136 NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
137 WimaxNetwork* wimax = cros->FindWimaxNetworkByPath(service_path_); 137 WimaxNetwork* wimax = cros->FindWimaxNetworkByPath(service_path_);
138 if (!wimax) { 138 if (!wimax) {
139 // Flimflam no longer knows about this wimax network (edge case). 139 // Shill no longer knows about this wimax network (edge case).
140 // TODO(stevenjb): Add a notification (chromium-os13225). 140 // TODO(stevenjb): Add a notification (chromium-os13225).
141 LOG(WARNING) << "Wimax network: " << service_path_ << " no longer exists."; 141 LOG(WARNING) << "Wimax network: " << service_path_ << " no longer exists.";
142 return true; 142 return true;
143 } 143 }
144 wimax->SetEAPIdentity(GetEapIdentity()); 144 wimax->SetEAPIdentity(GetEapIdentity());
145 wimax->SetEAPPassphrase(GetEapPassphrase()); 145 wimax->SetEAPPassphrase(GetEapPassphrase());
146 wimax->SetSaveCredentials(GetSaveCredentials()); 146 wimax->SetSaveCredentials(GetSaveCredentials());
147 bool share_default = (wimax->profile_type() != PROFILE_USER); 147 bool share_default = (wimax->profile_type() != PROFILE_USER);
148 bool share = GetShareNetwork(share_default); 148 bool share = GetShareNetwork(share_default);
149 wimax->SetEnrollmentDelegate( 149 wimax->SetEnrollmentDelegate(
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 UpdateErrorLabel(); 329 UpdateErrorLabel();
330 } 330 }
331 331
332 void WimaxConfigView::InitFocus() { 332 void WimaxConfigView::InitFocus() {
333 views::View* view_to_focus = GetInitiallyFocusedView(); 333 views::View* view_to_focus = GetInitiallyFocusedView();
334 if (view_to_focus) 334 if (view_to_focus)
335 view_to_focus->RequestFocus(); 335 view_to_focus->RequestFocus();
336 } 336 }
337 337
338 } // namespace chromeos 338 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/wifi_config_view.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698