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

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

Issue 17010003: Cleanup of system settings constants (ab)use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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) 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/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/desktop_background/desktop_background_controller.h" 9 #include "ash/desktop_background/desktop_background_controller.h"
10 #include "ash/desktop_background/user_wallpaper_delegate.h" 10 #include "ash/desktop_background/user_wallpaper_delegate.h"
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 content::NotificationService::AllSources()); 254 content::NotificationService::AllSources());
255 } 255 }
256 LOG(WARNING) << "Login WebUI >> " 256 LOG(WARNING) << "Login WebUI >> "
257 << "zero_delay: " << zero_delay_enabled 257 << "zero_delay: " << zero_delay_enabled
258 << " wait_for_wp_load_: " << waiting_for_wallpaper_load_ 258 << " wait_for_wp_load_: " << waiting_for_wallpaper_load_
259 << " wait_for_pods_: " << waiting_for_user_pods_ 259 << " wait_for_pods_: " << waiting_for_user_pods_
260 << " init_webui_hidden_: " << initialize_webui_hidden_; 260 << " init_webui_hidden_: " << initialize_webui_hidden_;
261 261
262 bool keyboard_driven_oobe = false; 262 bool keyboard_driven_oobe = false;
263 system::StatisticsProvider::GetInstance()->GetMachineFlag( 263 system::StatisticsProvider::GetInstance()->GetMachineFlag(
264 chromeos::kOemKeyboardDrivenOobeKey, &keyboard_driven_oobe); 264 chromeos::system::kOemKeyboardDrivenOobeKey,
265 &keyboard_driven_oobe);
265 if (keyboard_driven_oobe) 266 if (keyboard_driven_oobe)
266 views::FocusManager::set_arrow_key_traversal_enabled(true); 267 views::FocusManager::set_arrow_key_traversal_enabled(true);
267 } 268 }
268 269
269 LoginDisplayHostImpl::~LoginDisplayHostImpl() { 270 LoginDisplayHostImpl::~LoginDisplayHostImpl() {
270 views::FocusManager::set_arrow_key_traversal_enabled(false); 271 views::FocusManager::set_arrow_key_traversal_enabled(false);
271 ResetLoginWindowAndView(); 272 ResetLoginWindowAndView();
272 273
273 // Let chrome process exit after login/oobe screen if needed. 274 // Let chrome process exit after login/oobe screen if needed.
274 chrome::EndKeepAlive(); 275 chrome::EndKeepAlive();
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 VLOG(1) << "Initial time zone: " << timezone_name; 960 VLOG(1) << "Initial time zone: " << timezone_name;
960 // Apply locale customizations only once to preserve whatever locale 961 // Apply locale customizations only once to preserve whatever locale
961 // user has changed to during OOBE. 962 // user has changed to during OOBE.
962 if (!timezone_name.empty()) { 963 if (!timezone_name.empty()) {
963 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( 964 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
964 UTF8ToUTF16(timezone_name)); 965 UTF8ToUTF16(timezone_name));
965 } 966 }
966 } 967 }
967 968
968 } // namespace chromeos 969 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/hwid_checker.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698