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

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

Issue 899113002: Manual revert of Timezone auto update option should be available by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ui/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/audio/sounds.h" 9 #include "ash/audio/sounds.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1116 } 1116 }
1117 1117
1118 void LoginDisplayHostImpl::OnLoginPromptVisible() { 1118 void LoginDisplayHostImpl::OnLoginPromptVisible() {
1119 if (!login_prompt_visible_time_.is_null()) 1119 if (!login_prompt_visible_time_.is_null())
1120 return; 1120 return;
1121 login_prompt_visible_time_ = base::TimeTicks::Now(); 1121 login_prompt_visible_time_ = base::TimeTicks::Now();
1122 TryToPlayStartupSound(); 1122 TryToPlayStartupSound();
1123 } 1123 }
1124 1124
1125 void LoginDisplayHostImpl::StartTimeZoneResolve() { 1125 void LoginDisplayHostImpl::StartTimeZoneResolve() {
1126 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 1126 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
1127 chromeos::switches::kDisableTimeZoneTrackingOption)) { 1127 chromeos::switches::kEnableTimeZoneTrackingOption)) {
1128 return; 1128 return;
1129 } 1129 }
1130 1130
1131 if (!g_browser_process->local_state()->GetBoolean( 1131 if (!g_browser_process->local_state()->GetBoolean(
1132 prefs::kResolveDeviceTimezoneByGeolocation)) { 1132 prefs::kResolveDeviceTimezoneByGeolocation)) {
1133 return; 1133 return;
1134 } 1134 }
1135 1135
1136 if (system::HasSystemTimezonePolicy()) 1136 if (system::HasSystemTimezonePolicy())
1137 return; 1137 return;
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1266 1266
1267 locale_util::SwitchLanguageCallback callback( 1267 locale_util::SwitchLanguageCallback callback(
1268 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))); 1268 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())));
1269 1269
1270 // Load locale keyboards here. Hardware layout would be automatically enabled. 1270 // Load locale keyboards here. Hardware layout would be automatically enabled.
1271 locale_util::SwitchLanguage( 1271 locale_util::SwitchLanguage(
1272 locale, true, true /* login_layouts_only */, callback); 1272 locale, true, true /* login_layouts_only */, callback);
1273 } 1273 }
1274 1274
1275 } // namespace chromeos 1275 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698