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

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

Issue 6312160: Map Views to Profiles directly from their window, eliminating the need... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 void NetworkSelectionView::OnLocaleChanged() { 367 void NetworkSelectionView::OnLocaleChanged() {
368 show_keyboard_button_ = true; 368 show_keyboard_button_ = true;
369 UpdateLocalizedStrings(); 369 UpdateLocalizedStrings();
370 // Proxy settings dialog contains localized title. Zap it. 370 // Proxy settings dialog contains localized title. Zap it.
371 proxy_settings_dialog_.reset(NULL); 371 proxy_settings_dialog_.reset(NULL);
372 372
373 Layout(); 373 Layout();
374 SchedulePaint(); 374 SchedulePaint();
375 } 375 }
376 376
377 void NetworkSelectionView::ViewHierarchyChanged(bool is_add,
378 View* parent,
379 View* child) {
380 if (is_add && this == child)
381 WizardAccessibilityHelper::GetInstance()->MaybeEnableAccessibility(this);
382 }
383
384 //////////////////////////////////////////////////////////////////////////////// 377 ////////////////////////////////////////////////////////////////////////////////
385 // NetworkSelectionView, public: 378 // NetworkSelectionView, public:
386 379
387 gfx::NativeWindow NetworkSelectionView::GetNativeWindow() const { 380 gfx::NativeWindow NetworkSelectionView::GetNativeWindow() const {
388 return GTK_WINDOW(static_cast<WidgetGtk*>(GetWidget())->GetNativeView()); 381 return GTK_WINDOW(static_cast<WidgetGtk*>(GetWidget())->GetNativeView());
389 } 382 }
390 383
391 views::View* NetworkSelectionView::GetNetworkControlView() const { 384 views::View* NetworkSelectionView::GetNetworkControlView() const {
392 return network_dropdown_; 385 return network_dropdown_;
393 } 386 }
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON))); 449 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON)));
457 continue_button_->SetEnabled(is_continue_enabled); 450 continue_button_->SetEnabled(is_continue_enabled);
458 } 451 }
459 452
460 void NetworkSelectionView::UpdateConnectingNetworkLabel() { 453 void NetworkSelectionView::UpdateConnectingNetworkLabel() {
461 connecting_network_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16( 454 connecting_network_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16(
462 IDS_NETWORK_SELECTION_CONNECTING, network_id_))); 455 IDS_NETWORK_SELECTION_CONNECTING, network_id_)));
463 } 456 }
464 457
465 } // namespace chromeos 458 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/network_selection_view.h ('k') | chrome/browser/chromeos/login/new_user_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698