Make chrome/browser/ui/webui not depend on ash when using Athena

chrome/browser/ui/webui/chromeos/set_time_ui.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/values.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/system_clock_client.h"
+#include "chromeos/login/login_state.h"
 #include "chromeos/settings/timezone_settings.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 84 matching lines @@
                              IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION);
   source->AddLocalizedString("dateLabel", IDS_SET_TIME_DATE_LABEL);
   source->AddLocalizedString("timeLabel", IDS_SET_TIME_TIME_LABEL);
 
   base::DictionaryValue values;
   values.Set("timezoneList", chromeos::system::GetTimezoneList().release());
 
   // 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 (ash::Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus() ==
-      ash::user::LOGGED_IN_NONE) {
+  if (!LoginState::Get()->IsUserLoggedIn())
     CrosSettings::Get()->GetString(kSystemTimezone, &current_timezone_id);
-  }
   values.SetString("currentTimezoneId", current_timezone_id);
   values.SetDouble("buildTime", base::GetBuildTime().ToJsTime());
 
   source->AddLocalizedStrings(values);
   source->SetJsonPath("strings.js");
 
   source->AddResourcePath("set_time.css", IDR_SET_TIME_CSS);
   source->AddResourcePath("set_time.js", IDR_SET_TIME_JS);
   source->SetDefaultResource(IDR_SET_TIME_HTML);
 
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), source);
 }
 
 SetTimeUI::~SetTimeUI() {
 }
 
 }  // namespace chromeos