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

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

Issue 3166028: Replace network combobox with network dropdown button (Closed)
Patch Set: Removed trailing spaces Created 10 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) 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/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 #include <signal.h> 8 #include <signal.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 views::Widget* background_widget, 336 views::Widget* background_widget,
337 chromeos::BackgroundView* background_view) { 337 chromeos::BackgroundView* background_view) {
338 DCHECK(!background_widget_); 338 DCHECK(!background_widget_);
339 background_widget_ = background_widget; 339 background_widget_ = background_widget;
340 background_view_ = background_view; 340 background_view_ = background_view;
341 background_view_->OnOwnerChanged(); 341 background_view_->OnOwnerChanged();
342 } 342 }
343 343
344 chromeos::NetworkScreen* WizardController::GetNetworkScreen() { 344 chromeos::NetworkScreen* WizardController::GetNetworkScreen() {
345 if (!network_screen_.get()) 345 if (!network_screen_.get())
346 network_screen_.reset(new chromeos::NetworkScreen(this, is_out_of_box_)); 346 network_screen_.reset(new chromeos::NetworkScreen(this));
347 return network_screen_.get(); 347 return network_screen_.get();
348 } 348 }
349 349
350 chromeos::LoginScreen* WizardController::GetLoginScreen() { 350 chromeos::LoginScreen* WizardController::GetLoginScreen() {
351 if (!login_screen_.get()) 351 if (!login_screen_.get())
352 login_screen_.reset(new chromeos::LoginScreen(this)); 352 login_screen_.reset(new chromeos::LoginScreen(this));
353 return login_screen_.get(); 353 return login_screen_.get();
354 } 354 }
355 355
356 chromeos::AccountScreen* WizardController::GetAccountScreen() { 356 chromeos::AccountScreen* WizardController::GetAccountScreen() {
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 // user has changed to during OOBE. 905 // user has changed to during OOBE.
906 if (!timezone_name.empty()) { 906 if (!timezone_name.empty()) {
907 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( 907 icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
908 icu::UnicodeString::fromUTF8(timezone_name)); 908 icu::UnicodeString::fromUTF8(timezone_name));
909 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone); 909 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone);
910 } 910 }
911 } 911 }
912 } 912 }
913 913
914 } // namespace browser 914 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698