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 232 matching lines...) Loading... |
243 | 243 |
244 column_set = contents_layout->AddColumnSet(STANDARD_ROW); | 244 column_set = contents_layout->AddColumnSet(STANDARD_ROW); |
245 column_set->AddPaddingColumn(1, kPaddingColumnWidth); | 245 column_set->AddPaddingColumn(1, kPaddingColumnWidth); |
246 column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0, | 246 column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0, |
247 GridLayout::FIXED, widest_label, widest_label); | 247 GridLayout::FIXED, widest_label, widest_label); |
248 column_set->AddPaddingColumn(0, kMediumPaddingColumnWidth); | 248 column_set->AddPaddingColumn(0, kMediumPaddingColumnWidth); |
249 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0, | 249 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0, |
250 GridLayout::FIXED, dropdown_width, dropdown_width); | 250 GridLayout::FIXED, dropdown_width, dropdown_width); |
251 column_set->AddPaddingColumn(1, kPaddingColumnWidth); | 251 column_set->AddPaddingColumn(1, kPaddingColumnWidth); |
252 | 252 |
253 const int h_padding = 30/*(screen_size.width() - 2 * kBorderSize - | 253 const int h_padding = 30; |
254 connecting_network_label_->GetPreferredSize().width() - | |
255 throbber_->GetPreferredSize().width()) / 2*/; | |
256 column_set = contents_layout->AddColumnSet(THROBBER_ROW); | 254 column_set = contents_layout->AddColumnSet(THROBBER_ROW); |
257 column_set->AddPaddingColumn(1, h_padding); | 255 column_set->AddPaddingColumn(1, h_padding); |
258 column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0, | 256 column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0, |
259 GridLayout::USE_PREF, 0, 0); | 257 GridLayout::USE_PREF, 0, 0); |
260 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); | 258 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); |
261 column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1, | 259 column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1, |
262 GridLayout::USE_PREF, 0, 0); | 260 GridLayout::USE_PREF, 0, 0); |
263 column_set->AddPaddingColumn(1, h_padding); | 261 column_set->AddPaddingColumn(1, h_padding); |
264 | 262 |
265 AddControlsToLayout(contents_layout); | 263 AddControlsToLayout(contents_layout); |
(...skipping 58 matching lines...) Loading... |
324 network_dropdown_->set_animate_on_state_change(false); | 322 network_dropdown_->set_animate_on_state_change(false); |
325 | 323 |
326 connecting_network_label_ = new views::Label(); | 324 connecting_network_label_ = new views::Label(); |
327 connecting_network_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont)); | 325 connecting_network_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont)); |
328 connecting_network_label_->SetVisible(false); | 326 connecting_network_label_->SetVisible(false); |
329 | 327 |
330 proxy_settings_link_ = new views::Link(); | 328 proxy_settings_link_ = new views::Link(); |
331 proxy_settings_link_->SetController(this); | 329 proxy_settings_link_->SetController(this); |
332 proxy_settings_link_->SetVisible(true); | 330 proxy_settings_link_->SetVisible(true); |
333 proxy_settings_link_->SetFocusable(true); | 331 proxy_settings_link_->SetFocusable(true); |
| 332 proxy_settings_link_->SetNormalColor(login::kLinkColor); |
| 333 proxy_settings_link_->SetHighlightedColor(login::kLinkColor); |
334 | 334 |
335 UpdateLocalizedStrings(); | 335 UpdateLocalizedStrings(); |
336 } | 336 } |
337 | 337 |
338 void NetworkSelectionView::UpdateLocalizedStrings() { | 338 void NetworkSelectionView::UpdateLocalizedStrings() { |
339 languages_menubutton_->SetText( | 339 languages_menubutton_->SetText( |
340 delegate_->language_switch_menu()->GetCurrentLocaleName()); | 340 delegate_->language_switch_menu()->GetCurrentLocaleName()); |
341 keyboards_menubutton_->SetText( | 341 keyboards_menubutton_->SetText( |
342 delegate_->keyboard_switch_menu()->GetCurrentKeyboardName()); | 342 delegate_->keyboard_switch_menu()->GetCurrentKeyboardName()); |
343 welcome_label_->SetText(l10n_util::GetStringF(IDS_NETWORK_SELECTION_TITLE, | 343 welcome_label_->SetText(l10n_util::GetStringF(IDS_NETWORK_SELECTION_TITLE, |
(...skipping 131 matching lines...) Loading... |
475 l10n_util::GetString(IDS_NETWORK_SELECTION_CONTINUE_BUTTON)); | 475 l10n_util::GetString(IDS_NETWORK_SELECTION_CONTINUE_BUTTON)); |
476 continue_button_->SetEnabled(is_continue_enabled); | 476 continue_button_->SetEnabled(is_continue_enabled); |
477 } | 477 } |
478 | 478 |
479 void NetworkSelectionView::UpdateConnectingNetworkLabel() { | 479 void NetworkSelectionView::UpdateConnectingNetworkLabel() { |
480 connecting_network_label_->SetText(l10n_util::GetStringF( | 480 connecting_network_label_->SetText(l10n_util::GetStringF( |
481 IDS_NETWORK_SELECTION_CONNECTING, UTF16ToWide(network_id_))); | 481 IDS_NETWORK_SELECTION_CONNECTING, UTF16ToWide(network_id_))); |
482 } | 482 } |
483 | 483 |
484 } // namespace chromeos | 484 } // namespace chromeos |
OLD | NEW |