chrome/browser/chromeos/login/lock/webui_screen_locker.h - Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/login/lock/webui_screen_locker.h

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 5 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

« no previous file with comments | « chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc ('k') | chrome/browser/chromeos/login/lock/webui_screen_locker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_

6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_	6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_

7	7

8 #include <stdint.h>	8 #include <stdint.h>

9	9

10 #include <memory>	10 #include <memory>

11 #include <string>	11 #include <string>

12	12

13 #include "ash/shell_delegate.h"	13 #include "ash/common/shell_delegate.h"

14 #include "ash/wm/lock_state_observer.h"	14 #include "ash/wm/lock_state_observer.h"

15 #include "base/compiler_specific.h"

16 #include "base/macros.h"	15 #include "base/macros.h"

17 #include "base/memory/weak_ptr.h"	16 #include "base/memory/weak_ptr.h"

18 #include "base/time/time.h"	17 #include "base/time/time.h"

19 #include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h"	18 #include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h"

20 #include "chrome/browser/chromeos/login/signin_screen_controller.h"	19 #include "chrome/browser/chromeos/login/signin_screen_controller.h"

21 #include "chrome/browser/chromeos/login/signin_specifics.h"	20 #include "chrome/browser/chromeos/login/signin_specifics.h"

22 #include "chrome/browser/chromeos/login/ui/lock_window.h"	21 #include "chrome/browser/chromeos/login/ui/lock_window.h"

23 #include "chrome/browser/chromeos/login/ui/login_display.h"	22 #include "chrome/browser/chromeos/login/ui/login_display.h"

24 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"	23 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"

25 #include "chromeos/dbus/power_manager_client.h"	24 #include "chromeos/dbus/power_manager_client.h"

(...skipping 139 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
165 bool is_observing_keyboard_ = false;	164 bool is_observing_keyboard_ = false;

166	165

167 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_;	166 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_;

168	167

169 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker);	168 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker);

170 };	169 };

171	170

172 } // namespace chromeos	171 } // namespace chromeos

173	172

174 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_	173 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_

OLD	NEW