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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 finalize_animation_type_ = ANIMATION_NONE; 533 finalize_animation_type_ = ANIMATION_NONE;
534 LOG(WARNING) << "Login WebUI >> user adding"; 534 LOG(WARNING) << "Login WebUI >> user adding";
535 if (!login_window_) 535 if (!login_window_)
536 LoadURL(GURL(kUserAddingURL)); 536 LoadURL(GURL(kUserAddingURL));
537 // We should emit this signal only at login screen (after reboot or sign out). 537 // We should emit this signal only at login screen (after reboot or sign out).
538 login_view_->set_should_emit_login_prompt_visible(false); 538 login_view_->set_should_emit_login_prompt_visible(false);
539 539
540 // Lock container can be transparent after lock screen animation. 540 // Lock container can be transparent after lock screen animation.
541 aura::Window* lock_container = ash::Shell::GetContainer( 541 aura::Window* lock_container = ash::Shell::GetContainer(
542 ash::Shell::GetPrimaryRootWindow(), 542 ash::Shell::GetPrimaryRootWindow(),
543 ash::internal::kShellWindowId_LockScreenContainersContainer); 543 ash::kShellWindowId_LockScreenContainersContainer);
544 lock_container->layer()->SetOpacity(1.0); 544 lock_container->layer()->SetOpacity(1.0);
545 545
546 ash::Shell::GetInstance()-> 546 ash::Shell::GetInstance()->
547 desktop_background_controller()->MoveDesktopToLockedContainer(); 547 desktop_background_controller()->MoveDesktopToLockedContainer();
548 548
549 sign_in_controller_.reset(); // Only one controller in a time. 549 sign_in_controller_.reset(); // Only one controller in a time.
550 sign_in_controller_.reset(new chromeos::ExistingUserController(this)); 550 sign_in_controller_.reset(new chromeos::ExistingUserController(this));
551 SetOobeProgressBarVisible(oobe_progress_bar_visible_ = false); 551 SetOobeProgressBarVisible(oobe_progress_bar_visible_ = false);
552 SetStatusAreaVisible(true); 552 SetStatusAreaVisible(true);
553 sign_in_controller_->Init( 553 sign_in_controller_->Init(
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 registrar_.RemoveAll(); 811 registrar_.RemoveAll();
812 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); 812 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
813 if (post_quit_task) 813 if (post_quit_task)
814 base::MessageLoop::current()->Quit(); 814 base::MessageLoop::current()->Quit();
815 815
816 if (!completion_callback_.is_null()) 816 if (!completion_callback_.is_null())
817 completion_callback_.Run(); 817 completion_callback_.Run();
818 } 818 }
819 819
820 void LoginDisplayHostImpl::ScheduleWorkspaceAnimation() { 820 void LoginDisplayHostImpl::ScheduleWorkspaceAnimation() {
821 if (ash::Shell::GetContainer( 821 if (ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
822 ash::Shell::GetPrimaryRootWindow(), 822 ash::kShellWindowId_DesktopBackgroundContainer)
823 ash::internal::kShellWindowId_DesktopBackgroundContainer)-> 823 ->children()
824 children().empty()) { 824 .empty()) {
825 // If there is no background window, don't perform any animation on the 825 // If there is no background window, don't perform any animation on the
826 // default and background layer because there is nothing behind it. 826 // default and background layer because there is nothing behind it.
827 return; 827 return;
828 } 828 }
829 829
830 if (!CommandLine::ForCurrentProcess()->HasSwitch( 830 if (!CommandLine::ForCurrentProcess()->HasSwitch(
831 switches::kDisableLoginAnimations)) 831 switches::kDisableLoginAnimations))
832 ash::Shell::GetInstance()->DoInitialWorkspaceAnimation(); 832 ash::Shell::GetInstance()->DoInitialWorkspaceAnimation();
833 } 833 }
834 834
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
930 930
931 keyboard_driven_oobe_key_handler_.reset(new KeyboardDrivenOobeKeyHandler); 931 keyboard_driven_oobe_key_handler_.reset(new KeyboardDrivenOobeKeyHandler);
932 } 932 }
933 933
934 views::Widget::InitParams params( 934 views::Widget::InitParams params(
935 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 935 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
936 params.bounds = background_bounds(); 936 params.bounds = background_bounds();
937 params.show_state = ui::SHOW_STATE_FULLSCREEN; 937 params.show_state = ui::SHOW_STATE_FULLSCREEN;
938 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 938 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
939 params.parent = 939 params.parent =
940 ash::Shell::GetContainer( 940 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
941 ash::Shell::GetPrimaryRootWindow(), 941 ash::kShellWindowId_LockScreenContainer);
942 ash::internal::kShellWindowId_LockScreenContainer);
943 942
944 login_window_ = new views::Widget; 943 login_window_ = new views::Widget;
945 login_window_->Init(params); 944 login_window_->Init(params);
946 login_view_ = new WebUILoginView(); 945 login_view_ = new WebUILoginView();
947 login_view_->Init(); 946 login_view_->Init();
948 if (login_view_->webui_visible()) 947 if (login_view_->webui_visible())
949 OnLoginPromptVisible(); 948 OnLoginPromptVisible();
950 949
951 wm::SetWindowVisibilityAnimationDuration( 950 wm::SetWindowVisibilityAnimationDuration(
952 login_window_->GetNativeView(), 951 login_window_->GetNativeView(),
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1162 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1164 new locale_util::SwitchLanguageCallback( 1163 new locale_util::SwitchLanguageCallback(
1165 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1164 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1166 1165
1167 // Load locale keyboards here. Hardware layout would be automatically enabled. 1166 // Load locale keyboards here. Hardware layout would be automatically enabled.
1168 locale_util::SwitchLanguage( 1167 locale_util::SwitchLanguage(
1169 locale, true, true /* login_layouts_only */, callback.Pass()); 1168 locale, true, true /* login_layouts_only */, callback.Pass());
1170 } 1169 }
1171 1170
1172 } // namespace chromeos 1171 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/lock_window_aura.cc ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698