diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc')
| -rw-r--r-- | chromium/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc b/chromium/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc index af75d9e1805..b8d7f9d35a7 100644 --- a/chromium/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc +++ b/chromium/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" -#include "ash/system/devicetype_utils.h" #include "base/message_loop/message_loop.h" #include "base/time/time.h" #include "chrome/browser/chromeos/login/screens/error_screen.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "components/login/localized_values_builder.h" +#include "ui/chromeos/devicetype_utils.h" #include "ui/strings/grit/ui_strings.h" namespace { @@ -70,11 +70,11 @@ void ErrorScreenHandler::RegisterMessages() { void ErrorScreenHandler::DeclareLocalizedValues( ::login::LocalizedValuesBuilder* builder) { - builder->Add("deviceType", ash::GetChromeOSDeviceName()); + builder->Add("deviceType", ui::GetChromeOSDeviceName()); builder->Add("loginErrorTitle", IDS_LOGIN_ERROR_TITLE); builder->Add("rollbackErrorTitle", IDS_RESET_SCREEN_REVERT_ERROR); builder->Add("signinOfflineMessageBody", - ash::SubstituteChromeOSDeviceType(IDS_LOGIN_OFFLINE_MESSAGE)); + ui::SubstituteChromeOSDeviceType(IDS_LOGIN_OFFLINE_MESSAGE)); builder->Add("kioskOfflineMessageBody", IDS_KIOSK_OFFLINE_MESSAGE); builder->Add("kioskOnlineTitle", IDS_LOGIN_NETWORK_RESTORED_TITLE); builder->Add("kioskOnlineMessageBody", IDS_KIOSK_ONLINE_MESSAGE); @@ -91,7 +91,7 @@ void ErrorScreenHandler::DeclareLocalizedValues( IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_NETWORK_SELECT); builder->Add("signinProxyMessageText", IDS_LOGIN_PROXY_ERROR_MESSAGE); builder->Add("updateOfflineMessageBody", - ash::SubstituteChromeOSDeviceType(IDS_UPDATE_OFFLINE_MESSAGE)); + ui::SubstituteChromeOSDeviceType(IDS_UPDATE_OFFLINE_MESSAGE)); builder->Add("updateProxyMessageText", IDS_UPDATE_PROXY_ERROR_MESSAGE); builder->AddF("localStateErrorText0", IDS_LOCAL_STATE_ERROR_TEXT_0, IDS_SHORT_PRODUCT_NAME); |