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

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

Issue 105673008: Remove unneeded ScopedLayerAnimationSettings::LockTransitionDuration() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/desktop_background/desktop_background_controller.h" 9 #include "ash/desktop_background/desktop_background_controller.h"
10 #include "ash/desktop_background/user_wallpaper_delegate.h" 10 #include "ash/desktop_background/user_wallpaper_delegate.h"
(...skipping 962 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 ash::Shell::GetPrimaryRootWindow(), 973 ash::Shell::GetPrimaryRootWindow(),
974 ash::internal::kShellWindowId_LockScreenContainer); 974 ash::internal::kShellWindowId_LockScreenContainer);
975 975
976 login_window_ = new views::Widget; 976 login_window_ = new views::Widget;
977 login_window_->Init(params); 977 login_window_->Init(params);
978 login_view_ = new WebUILoginView(); 978 login_view_ = new WebUILoginView();
979 login_view_->Init(); 979 login_view_->Init();
980 if (login_view_->webui_visible()) 980 if (login_view_->webui_visible())
981 OnLoginPromptVisible(); 981 OnLoginPromptVisible();
982 982
983 views::corewm::SetWindowVisibilityAnimationDuration( 983 views::corewm::SetWindowHideAnimationDuration(
984 login_window_->GetNativeView(), 984 login_window_->GetNativeView(),
985 base::TimeDelta::FromMilliseconds(kLoginFadeoutTransitionDurationMs)); 985 base::TimeDelta::FromMilliseconds(kLoginFadeoutTransitionDurationMs));
986 views::corewm::SetWindowVisibilityAnimationTransition( 986 views::corewm::SetWindowVisibilityAnimationTransition(
987 login_window_->GetNativeView(), 987 login_window_->GetNativeView(),
988 views::corewm::ANIMATE_HIDE); 988 views::corewm::ANIMATE_HIDE);
989 989
990 login_window_->SetContentsView(login_view_); 990 login_window_->SetContentsView(login_view_);
991 991
992 // If WebUI is initialized in hidden state, show it only if we're no 992 // If WebUI is initialized in hidden state, show it only if we're no
993 // longer waiting for wallpaper animation/user images loading. Otherwise, 993 // longer waiting for wallpaper animation/user images loading. Otherwise,
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
1195 1195
1196 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1196 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1197 new locale_util::SwitchLanguageCallback( 1197 new locale_util::SwitchLanguageCallback(
1198 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1198 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1199 1199
1200 // Do not load locale keyboards here. 1200 // Do not load locale keyboards here.
1201 locale_util::SwitchLanguage(locale, false, callback.Pass()); 1201 locale_util::SwitchLanguage(locale, false, callback.Pass());
1202 } 1202 }
1203 1203
1204 } // namespace chromeos 1204 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698