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

Side by Side Diff: chrome/browser/chromeos/login/ui/lock_window.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: rebase Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ui/lock_window.h" 5 #include "chrome/browser/chromeos/login/ui/lock_window.h"
6 6
7 #include "ash/common/shell_window_ids.h" 7 #include "ash/public/cpp/shell_window_ids.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/events/gestures/gesture_recognizer.h" 10 #include "ui/events/gestures/gesture_recognizer.h"
11 11
12 namespace chromeos { 12 namespace chromeos {
13 13
14 LockWindow::LockWindow() { 14 LockWindow::LockWindow() {
15 ui::GestureRecognizer::Get()->CancelActiveTouchesExcept(nullptr); 15 ui::GestureRecognizer::Get()->CancelActiveTouchesExcept(nullptr);
16 16
17 views::Widget::InitParams params( 17 views::Widget::InitParams params(
(...skipping 23 matching lines...) Expand all
41 41
42 const views::Widget* LockWindow::GetWidget() const { 42 const views::Widget* LockWindow::GetWidget() const {
43 return this; 43 return this;
44 } 44 }
45 45
46 views::View* LockWindow::GetInitiallyFocusedView() { 46 views::View* LockWindow::GetInitiallyFocusedView() {
47 return initially_focused_view_; 47 return initially_focused_view_;
48 } 48 }
49 49
50 } // namespace chromeos 50 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698