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

Unified Diff: chrome/browser/chromeos/login/ui/lock_window_aura.cc

Issue 620663005: Lock screen for Chrome-Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: set athena::FillLayoutManager for lock screen Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/ui/lock_window_aura.cc
diff --git a/chrome/browser/chromeos/login/ui/lock_window_aura.cc b/chrome/browser/chromeos/login/ui/lock_window_aura.cc
index 258a0fe696a14356a5fe7affdcb5c885508b73ae..377936811c18115c0b3901c4f66b881c6fc5524f 100644
--- a/chrome/browser/chromeos/login/ui/lock_window_aura.cc
+++ b/chrome/browser/chromeos/login/ui/lock_window_aura.cc
@@ -11,6 +11,12 @@
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
+#if defined(USE_ATHENA)
+#include "athena/screen/public/screen_manager.h"
+#include "athena/util/container_priorities.h"
+#include "athena/util/fill_layout_manager.h"
+#endif
+
namespace chromeos {
LockWindow* LockWindow::Create() {
@@ -58,11 +64,24 @@ void LockWindowAura::Init() {
views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
params.delegate = this;
params.show_state = ui::SHOW_STATE_FULLSCREEN;
+#if defined(USE_ATHENA)
+ // Don't set TRANSLUCENT_WINDOW because we don't have wallpaper manager yet.
Nikita (slow) 2014/10/10 10:53:06 But currently login screen works just fine being t
Dmitry Polukhin 2014/10/10 11:30:01 Added link to the bug about move wallpaper manager
+ athena::ScreenManager::ContainerParams container_params(
+ "LoginScreen", athena::CP_LOGIN_SCREEN);
+ container_params.can_activate_children = true;
+ container_params.grab_inputs = true;
+ lock_screen_container_.reset(
+ athena::ScreenManager::Get()->CreateContainer(container_params));
+ params.parent = lock_screen_container_.get();
+ lock_screen_container_->SetLayoutManager(
+ new athena::FillLayoutManager(lock_screen_container_.get()));
+#else
params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
// TODO(oshima): move the lock screen harness to ash.
params.parent =
ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
ash::kShellWindowId_LockScreenContainer);
+#endif
views::Widget::Init(params);
wm::SetWindowVisibilityAnimationTransition(
GetNativeView(), wm::ANIMATE_NONE);

Powered by Google App Engine
This is Rietveld 408576698