OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/login/ui/login_display_host_impl.h" | 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/public/cpp/shell_window_ids.h" | 10 #include "ash/public/cpp/shell_window_ids.h" |
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1239 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; | 1239 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
1240 // The ash::Shell containers are not available in Mash | 1240 // The ash::Shell containers are not available in Mash |
1241 if (!ash_util::IsRunningInMash()) { | 1241 if (!ash_util::IsRunningInMash()) { |
1242 params.parent = | 1242 params.parent = |
1243 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), | 1243 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), |
1244 ash::kShellWindowId_LockScreenContainer); | 1244 ash::kShellWindowId_LockScreenContainer); |
1245 } else { | 1245 } else { |
1246 using ui::mojom::WindowManager; | 1246 using ui::mojom::WindowManager; |
1247 params.mus_properties[WindowManager::kContainerId_InitProperty] = | 1247 params.mus_properties[WindowManager::kContainerId_InitProperty] = |
1248 mojo::ConvertTo<std::vector<uint8_t>>( | 1248 mojo::ConvertTo<std::vector<uint8_t>>( |
1249 ash::kShellWindowId_LockScreenContainer); | 1249 static_cast<int32_t>(ash::kShellWindowId_LockScreenContainer)); |
1250 } | 1250 } |
1251 login_window_ = new views::Widget; | 1251 login_window_ = new views::Widget; |
1252 params.delegate = login_window_delegate_ = | 1252 params.delegate = login_window_delegate_ = |
1253 new LoginWidgetDelegate(login_window_, this); | 1253 new LoginWidgetDelegate(login_window_, this); |
1254 login_window_->Init(params); | 1254 login_window_->Init(params); |
1255 | 1255 |
1256 login_view_ = new WebUILoginView(WebUILoginView::WebViewSettings()); | 1256 login_view_ = new WebUILoginView(WebUILoginView::WebViewSettings()); |
1257 login_view_->Init(); | 1257 login_view_->Init(); |
1258 if (login_view_->webui_visible()) | 1258 if (login_view_->webui_visible()) |
1259 OnLoginPromptVisible(); | 1259 OnLoginPromptVisible(); |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1484 // Chrome locale. Otherwise it will be lost if Chrome restarts. | 1484 // Chrome locale. Otherwise it will be lost if Chrome restarts. |
1485 // Don't need to schedule pref save because setting initial local | 1485 // Don't need to schedule pref save because setting initial local |
1486 // will enforce preference saving. | 1486 // will enforce preference saving. |
1487 prefs->SetString(prefs::kApplicationLocale, locale); | 1487 prefs->SetString(prefs::kApplicationLocale, locale); |
1488 StartupUtils::SetInitialLocale(locale); | 1488 StartupUtils::SetInitialLocale(locale); |
1489 | 1489 |
1490 TriggerShowLoginWizardFinish(locale, std::move(data)); | 1490 TriggerShowLoginWizardFinish(locale, std::move(data)); |
1491 } | 1491 } |
1492 | 1492 |
1493 } // namespace chromeos | 1493 } // namespace chromeos |
OLD | NEW |