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

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

Issue 15974008: Rename SessionStateController -> LockStateController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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/webui_screen_locker.h
diff --git a/chrome/browser/chromeos/login/webui_screen_locker.h b/chrome/browser/chromeos/login/webui_screen_locker.h
index 10346871d48c21633ca9b408dab76b2e500b53e6..4579bbbda4f5ada0d289fe68210799f00b6a8a7e 100644
--- a/chrome/browser/chromeos/login/webui_screen_locker.h
+++ b/chrome/browser/chromeos/login/webui_screen_locker.h
@@ -7,7 +7,7 @@
#include <string>
-#include "ash/wm/session_state_observer.h"
+#include "ash/wm/lock_state_observer.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
@@ -43,7 +43,7 @@ class WebUIScreenLocker : public WebUILoginView,
public LoginDisplay::Delegate,
public ScreenLockerDelegate,
public LockWindow::Observer,
- public ash::SessionStateObserver,
+ public ash::LockStateObserver,
public views::WidgetObserver,
public PowerManagerClient::Observer,
public content::WebContentsObserver {
@@ -92,9 +92,9 @@ class WebUIScreenLocker : public WebUILoginView,
// LockWindow::Observer implementation.
virtual void OnLockWindowReady() OVERRIDE;
- // SessionStateObserver override.
- virtual void OnSessionStateEvent(ash::SessionStateObserver::EventType event)
- OVERRIDE;
+ // LockStateObserver override.
+ virtual void OnLockStateEvent(
+ ash::LockStateObserver::EventType event) OVERRIDE;
// WidgetObserver override.
virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.cc ('k') | chrome/browser/chromeos/login/webui_screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698