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

Side by Side Diff: chrome/browser/chromeos/login/network_screen.cc

Issue 6303008: [cros] Update OOBE network error message. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_screen.h" 5 #include "chrome/browser/chromeos/login/network_screen.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 views::View* network_control = view()->GetNetworkControlView(); 154 views::View* network_control = view()->GetNetworkControlView();
155 bubble_ = MessageBubble::Show( 155 bubble_ = MessageBubble::Show(
156 network_control->GetWidget(), 156 network_control->GetWidget(),
157 network_control->GetScreenBounds(), 157 network_control->GetScreenBounds(),
158 BubbleBorder::LEFT_TOP, 158 BubbleBorder::LEFT_TOP,
159 ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING), 159 ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING),
160 UTF16ToWide(l10n_util::GetStringFUTF16( 160 UTF16ToWide(l10n_util::GetStringFUTF16(
161 IDS_NETWORK_SELECTION_ERROR, 161 IDS_NETWORK_SELECTION_ERROR,
162 l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME), 162 l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME),
163 network_id_)), 163 network_id_)),
164 UTF16ToWide( 164 UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE)),
165 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_ERROR_HELP)),
166 this); 165 this);
167 network_control->RequestFocus(); 166 network_control->RequestFocus();
168 } 167 }
169 } 168 }
170 169
171 void NetworkScreen::UpdateStatus(NetworkLibrary* network) { 170 void NetworkScreen::UpdateStatus(NetworkLibrary* network) {
172 if (!view() || !network) 171 if (!view() || !network)
173 return; 172 return;
174 173
175 if (network->Connected()) 174 if (network->Connected())
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 &NetworkScreen::OnConnectionTimeout); 217 &NetworkScreen::OnConnectionTimeout);
219 } 218 }
220 219
221 network_id_ = network_id; 220 network_id_ = network_id;
222 view()->ShowConnectingStatus(continue_pressed_, network_id_); 221 view()->ShowConnectingStatus(continue_pressed_, network_id_);
223 222
224 view()->EnableContinue(false); 223 view()->EnableContinue(false);
225 } 224 }
226 225
227 } // namespace chromeos 226 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698