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

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

Issue 2867173003: cros: Move LockWindow from chrome to ash (Closed)
Patch Set: Reorder patches so view -> ui lands first Created 3 years, 7 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
« no previous file with comments | « chrome/browser/chromeos/login/ui/lock_window.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/ui/lock_window.cc
diff --git a/chrome/browser/chromeos/login/ui/lock_window.cc b/chrome/browser/chromeos/login/ui/lock_window.cc
deleted file mode 100644
index a2c30f7edbeb0a387c3842a7b02e93f0b48e118b..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/login/ui/lock_window.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/chromeos/login/ui/lock_window.h"
-
-#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/shell.h"
-#include "chrome/browser/ui/ash/ash_util.h"
-#include "services/ui/public/cpp/property_type_converters.h"
-#include "services/ui/public/interfaces/window_manager.mojom.h"
-#include "ui/aura/window.h"
-#include "ui/events/gestures/gesture_recognizer.h"
-
-namespace chromeos {
-
-LockWindow::LockWindow() {
- ui::GestureRecognizer::Get()->CancelActiveTouchesExcept(nullptr);
-
- views::Widget::InitParams params(
- views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
- params.delegate = this;
- params.show_state = ui::SHOW_STATE_FULLSCREEN;
- params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
- const int kLockContainer = ash::kShellWindowId_LockScreenContainer;
- if (ash_util::IsRunningInMash()) {
- using ui::mojom::WindowManager;
- params.mus_properties[WindowManager::kContainerId_InitProperty] =
- mojo::ConvertTo<std::vector<uint8_t>>(kLockContainer);
- } else {
- params.parent = ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
- kLockContainer);
- }
- Init(params);
- SetVisibilityAnimationTransition(views::Widget::ANIMATE_NONE);
-}
-
-LockWindow::~LockWindow() {}
-
-views::Widget* LockWindow::GetWidget() {
- return this;
-}
-
-const views::Widget* LockWindow::GetWidget() const {
- return this;
-}
-
-views::View* LockWindow::GetInitiallyFocusedView() {
- // There are multiple GetContentsView definitions; use the views::Widget one.
- return views::Widget::GetContentsView();
-}
-
-} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/login/ui/lock_window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698