OLD | NEW |
---|---|
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/login/base_login_display_host.h" | 5 #include "chrome/browser/chromeos/login/base_login_display_host.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
190 #if defined(USE_AURA) | 190 #if defined(USE_AURA) |
191 if (kEnableSigninTransitions) | 191 if (kEnableSigninTransitions) |
192 StartAnimation(); | 192 StartAnimation(); |
193 else | 193 else |
194 ShutdownDisplayHost(false); | 194 ShutdownDisplayHost(false); |
195 #else | 195 #else |
196 ShutdownDisplayHost(false); | 196 ShutdownDisplayHost(false); |
197 #endif | 197 #endif |
198 } | 198 } |
199 | 199 |
200 void BaseLoginDisplayHost::PreSessionStart() { | |
201 #if defined(USE_AURA) | |
202 GetWidget()->GetNativeView()->set_stops_event_propagation(false); | |
sky
2012/01/12 01:05:14
Add a comment as to why this is needed.
| |
203 #endif | |
204 } | |
205 | |
200 void BaseLoginDisplayHost::StartWizard( | 206 void BaseLoginDisplayHost::StartWizard( |
201 const std::string& first_screen_name, | 207 const std::string& first_screen_name, |
202 DictionaryValue* screen_parameters) { | 208 DictionaryValue* screen_parameters) { |
203 DVLOG(1) << "Starting wizard, first_screen_name: " << first_screen_name; | 209 DVLOG(1) << "Starting wizard, first_screen_name: " << first_screen_name; |
204 // Create and show the wizard. | 210 // Create and show the wizard. |
205 // Note, dtor of the old WizardController should be called before ctor of the | 211 // Note, dtor of the old WizardController should be called before ctor of the |
206 // new one, because "default_controller()" is updated there. So pure "reset()" | 212 // new one, because "default_controller()" is updated there. So pure "reset()" |
207 // is done before new controller creation. | 213 // is done before new controller creation. |
208 wizard_controller_.reset(); | 214 wizard_controller_.reset(); |
209 wizard_controller_.reset(CreateWizardController()); | 215 wizard_controller_.reset(CreateWizardController()); |
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
587 // user has changed to during OOBE. | 593 // user has changed to during OOBE. |
588 if (!timezone_name.empty()) { | 594 if (!timezone_name.empty()) { |
589 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( | 595 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( |
590 icu::UnicodeString::fromUTF8(timezone_name)); | 596 icu::UnicodeString::fromUTF8(timezone_name)); |
591 CHECK(timezone) << "Timezone could not be set for " << timezone_name; | 597 CHECK(timezone) << "Timezone could not be set for " << timezone_name; |
592 chromeos::system::TimezoneSettings::GetInstance()->SetTimezone(*timezone); | 598 chromeos::system::TimezoneSettings::GetInstance()->SetTimezone(*timezone); |
593 } | 599 } |
594 } | 600 } |
595 | 601 |
596 } // namespace browser | 602 } // namespace browser |
OLD | NEW |