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

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

Issue 139013006: Revert 245031 "This CL" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1795/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
« no previous file with comments | « ash/wm/window_animations_unittest.cc ('k') | ui/compositor/layer_animator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/audio/sounds.h" 9 #include "ash/audio/sounds.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 961 matching lines...) Expand 10 before | Expand all | Expand 10 after
972 ash::Shell::GetPrimaryRootWindow(), 972 ash::Shell::GetPrimaryRootWindow(),
973 ash::internal::kShellWindowId_LockScreenContainer); 973 ash::internal::kShellWindowId_LockScreenContainer);
974 974
975 login_window_ = new views::Widget; 975 login_window_ = new views::Widget;
976 login_window_->Init(params); 976 login_window_->Init(params);
977 login_view_ = new WebUILoginView(); 977 login_view_ = new WebUILoginView();
978 login_view_->Init(); 978 login_view_->Init();
979 if (login_view_->webui_visible()) 979 if (login_view_->webui_visible())
980 OnLoginPromptVisible(); 980 OnLoginPromptVisible();
981 981
982 views::corewm::SetWindowHideAnimationDuration( 982 views::corewm::SetWindowVisibilityAnimationDuration(
983 login_window_->GetNativeView(), 983 login_window_->GetNativeView(),
984 base::TimeDelta::FromMilliseconds(kLoginFadeoutTransitionDurationMs)); 984 base::TimeDelta::FromMilliseconds(kLoginFadeoutTransitionDurationMs));
985 views::corewm::SetWindowVisibilityAnimationTransition( 985 views::corewm::SetWindowVisibilityAnimationTransition(
986 login_window_->GetNativeView(), 986 login_window_->GetNativeView(),
987 views::corewm::ANIMATE_HIDE); 987 views::corewm::ANIMATE_HIDE);
988 988
989 login_window_->SetContentsView(login_view_); 989 login_window_->SetContentsView(login_view_);
990 990
991 // If WebUI is initialized in hidden state, show it only if we're no 991 // If WebUI is initialized in hidden state, show it only if we're no
992 // longer waiting for wallpaper animation/user images loading. Otherwise, 992 // longer waiting for wallpaper animation/user images loading. Otherwise,
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 1191
1192 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1192 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1193 new locale_util::SwitchLanguageCallback( 1193 new locale_util::SwitchLanguageCallback(
1194 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1194 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1195 1195
1196 // Do not load locale keyboards here. 1196 // Do not load locale keyboards here.
1197 locale_util::SwitchLanguage(locale, false, callback.Pass()); 1197 locale_util::SwitchLanguage(locale, false, callback.Pass());
1198 } 1198 }
1199 1199
1200 } // namespace chromeos 1200 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/wm/window_animations_unittest.cc ('k') | ui/compositor/layer_animator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698