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

Unified Diff: chrome/browser/chromeos/login/lock/webui_screen_locker.h

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
Index: chrome/browser/chromeos/login/lock/webui_screen_locker.h
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.h b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
index a68ecc36271ecf4a735c30a5a7dbdb5287537d64..697b659856c1a76e433a7b89eec6990b192f906b 100644
--- a/chrome/browser/chromeos/login/lock/webui_screen_locker.h
+++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
@@ -10,13 +10,13 @@
#include <memory>
#include <string>
+#include "ash/login/ui/lock_window.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "chrome/browser/chromeos/login/signin_screen_controller.h"
#include "chrome/browser/chromeos/login/signin_specifics.h"
-#include "chrome/browser/chromeos/login/ui/lock_window.h"
#include "chrome/browser/chromeos/login/ui/login_display.h"
#include "chrome/browser/chromeos/login/ui/webui_login_view.h"
#include "chromeos/dbus/power_manager_client.h"
@@ -147,7 +147,7 @@ class WebUIScreenLocker : public WebUILoginView,
ScreenLocker* screen_locker_ = nullptr;
// The screen locker window.
- LockWindow* lock_window_ = nullptr;
+ ash::LockWindow* lock_window_ = nullptr;
// Sign-in Screen controller instance (owns login screens).
std::unique_ptr<SignInScreenController> signin_screen_controller_;
« no previous file with comments | « chrome/browser/chromeos/login/lock/screen_locker.cc ('k') | chrome/browser/chromeos/login/lock/webui_screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698