| Index: chrome/browser/ui/webui/chromeos/set_time_ui.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/set_time_ui.cc b/chrome/browser/ui/webui/chromeos/set_time_ui.cc
|
| index 0b377e9a6046bd3d931b15a91c56be0b47cee149..f3b6949bcf6728add3d5f2a8f833bf0f402f8833 100644
|
| --- a/chrome/browser/ui/webui/chromeos/set_time_ui.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/set_time_ui.cc
|
| @@ -4,9 +4,6 @@
|
|
|
| #include "chrome/browser/ui/webui/chromeos/set_time_ui.h"
|
|
|
| -#include "ash/shell.h"
|
| -#include "ash/system/tray/system_tray_delegate.h"
|
| -#include "ash/system/user/login_status.h"
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/build_time.h"
|
| @@ -24,6 +21,12 @@
|
| #include "content/public/browser/web_ui_message_handler.h"
|
| #include "grit/browser_resources.h"
|
|
|
| +#if defined(USE_ASH)
|
| +#include "ash/shell.h"
|
| +#include "ash/system/tray/system_tray_delegate.h"
|
| +#include "ash/system/user/login_status.h"
|
| +#endif
|
| +
|
| namespace chromeos {
|
|
|
| namespace {
|
| @@ -122,10 +125,12 @@ SetTimeUI::SetTimeUI(content::WebUI* web_ui) : WebDialogUI(web_ui) {
|
| // If we are not logged in, we need to show the time zone dropdown.
|
| // Otherwise, we can leave |currentTimezoneId| blank.
|
| std::string current_timezone_id;
|
| +#if defined(USE_ASH)
|
| if (ash::Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus() ==
|
| ash::user::LOGGED_IN_NONE) {
|
| CrosSettings::Get()->GetString(kSystemTimezone, ¤t_timezone_id);
|
| }
|
| +#endif
|
| values.SetString("currentTimezoneId", current_timezone_id);
|
| values.SetDouble("buildTime", base::GetBuildTime().ToJsTime());
|
|
|
|
|