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

Side by Side Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 2512473004: cros: Enable WebUILoginView reuse. (Closed)
Patch Set: Address comments Created 4 years 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 unified diff | Download patch
OLDNEW
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/common/wallpaper/wallpaper_controller.h" 10 #include "ash/common/wallpaper/wallpaper_controller.h"
(...skipping 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 } else { 1134 } else {
1135 using ui::mojom::WindowManager; 1135 using ui::mojom::WindowManager;
1136 params.mus_properties[WindowManager::kContainerId_InitProperty] = 1136 params.mus_properties[WindowManager::kContainerId_InitProperty] =
1137 mojo::ConvertTo<std::vector<uint8_t>>( 1137 mojo::ConvertTo<std::vector<uint8_t>>(
1138 ash::kShellWindowId_LockScreenContainer); 1138 ash::kShellWindowId_LockScreenContainer);
1139 } 1139 }
1140 login_window_ = new views::Widget; 1140 login_window_ = new views::Widget;
1141 params.delegate = new LoginWidgetDelegate(login_window_); 1141 params.delegate = new LoginWidgetDelegate(login_window_);
1142 login_window_->Init(params); 1142 login_window_->Init(params);
1143 1143
1144 login_view_ = new WebUILoginView(); 1144 login_view_ = new WebUILoginView(WebUILoginView::WebViewSettings());
1145 login_view_->Init(); 1145 login_view_->Init();
1146 if (login_view_->webui_visible()) 1146 if (login_view_->webui_visible())
1147 OnLoginPromptVisible(); 1147 OnLoginPromptVisible();
1148 1148
1149 // Animations are not available in Mash 1149 // Animations are not available in Mash
1150 if (!chrome::IsRunningInMash()) { 1150 if (!chrome::IsRunningInMash()) {
1151 login_window_->SetVisibilityAnimationDuration( 1151 login_window_->SetVisibilityAnimationDuration(
1152 base::TimeDelta::FromMilliseconds(kLoginFadeoutTransitionDurationMs)); 1152 base::TimeDelta::FromMilliseconds(kLoginFadeoutTransitionDurationMs));
1153 login_window_->SetVisibilityAnimationTransition( 1153 login_window_->SetVisibilityAnimationTransition(
1154 views::Widget::ANIMATE_HIDE); 1154 views::Widget::ANIMATE_HIDE);
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
1367 1367
1368 locale_util::SwitchLanguageCallback callback( 1368 locale_util::SwitchLanguageCallback callback(
1369 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data)))); 1369 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data))));
1370 1370
1371 // Load locale keyboards here. Hardware layout would be automatically enabled. 1371 // Load locale keyboards here. Hardware layout would be automatically enabled.
1372 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */, 1372 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */,
1373 callback, ProfileManager::GetActiveUserProfile()); 1373 callback, ProfileManager::GetActiveUserProfile());
1374 } 1374 }
1375 1375
1376 } // namespace chromeos 1376 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/lock/webui_screen_locker.cc ('k') | chrome/browser/chromeos/login/ui/shared_web_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698