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

Unified Diff: chrome/browser/ui/webui/chromeos/set_time_ui.cc

Issue 684143003: Make chrome/browser/ui/webui not depend on ash when using Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash43_kiosk_mode
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
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..3e897ec976860bdc603d7ee2c162f0f8ac964816 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"
@@ -18,6 +15,7 @@
#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"
@@ -122,10 +120,8 @@ 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 (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());

Powered by Google App Engine
This is Rietveld 408576698