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

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 23125005: Update policy description for SystemUse24HourClock policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 4 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/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 void UnobserveDriveUpdates() { 905 void UnobserveDriveUpdates() {
906 DriveIntegrationService* integration_service = 906 DriveIntegrationService* integration_service =
907 FindDriveIntegrationService(); 907 FindDriveIntegrationService();
908 if (integration_service) 908 if (integration_service)
909 integration_service->job_list()->RemoveObserver(this); 909 integration_service->job_list()->RemoveObserver(this);
910 } 910 }
911 911
912 bool ShouldUse24HourClock() const { 912 bool ShouldUse24HourClock() const {
913 // On login screen and in guest mode owner default is used for 913 // On login screen and in guest mode owner default is used for
914 // kUse24HourClock preference. 914 // kUse24HourClock preference.
915 // All other modes default to the default locale value.
916 const ash::user::LoginStatus status = GetUserLoginStatus(); 915 const ash::user::LoginStatus status = GetUserLoginStatus();
917 const CrosSettings* const cros_settings = CrosSettings::Get(); 916 const CrosSettings* const cros_settings = CrosSettings::Get();
918 bool system_use_24_hour_clock = true; 917 bool system_use_24_hour_clock = true;
919 const bool system_value_found = cros_settings->GetBoolean( 918 const bool system_value_found = cros_settings->GetBoolean(
920 kSystemUse24HourClock, &system_use_24_hour_clock); 919 kSystemUse24HourClock, &system_use_24_hour_clock);
921 920
922 if (status == ash::user::LOGGED_IN_NONE) 921 if (status == ash::user::LOGGED_IN_NONE)
923 return (system_value_found ? system_use_24_hour_clock : true); 922 return (system_value_found ? system_use_24_hour_clock : true);
924 923
925 const PrefService::Preference* user_pref = 924 const PrefService::Preference* user_pref =
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
1231 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1230 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1232 }; 1231 };
1233 1232
1234 } // namespace 1233 } // namespace
1235 1234
1236 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1235 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1237 return new chromeos::SystemTrayDelegate(); 1236 return new chromeos::SystemTrayDelegate();
1238 } 1237 }
1239 1238
1240 } // namespace chromeos 1239 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/app/policy/policy_templates.json ('k') | chrome/browser/policy/proto/chromeos/chrome_device_policy.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698