OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/screen_locker.h" | 5 #include "chrome/browser/chromeos/login/screen_locker.h" |
6 | 6 |
7 #include <gdk/gdkx.h> | 7 #include <gdk/gdkx.h> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 #include <X11/extensions/XTest.h> | 10 #include <X11/extensions/XTest.h> |
(...skipping 854 matching lines...) Loading... |
865 if (screen_lock_view_) { | 865 if (screen_lock_view_) { |
866 screen_lock_view_->SetEnabled(true); | 866 screen_lock_view_->SetEnabled(true); |
867 screen_lock_view_->ClearAndSetFocusToPassword(); | 867 screen_lock_view_->ClearAndSetFocusToPassword(); |
868 screen_lock_view_->StopThrobber(); | 868 screen_lock_view_->StopThrobber(); |
869 } | 869 } |
870 } | 870 } |
871 | 871 |
872 void ScreenLocker::Signout() { | 872 void ScreenLocker::Signout() { |
873 if (!error_info_) { | 873 if (!error_info_) { |
874 UserMetrics::RecordAction(UserMetricsAction("ScreenLocker_Signout")); | 874 UserMetrics::RecordAction(UserMetricsAction("ScreenLocker_Signout")); |
| 875 WmIpc::instance()->NotifyAboutSignout(); |
875 if (CrosLibrary::Get()->EnsureLoaded()) { | 876 if (CrosLibrary::Get()->EnsureLoaded()) { |
876 CrosLibrary::Get()->GetLoginLibrary()->StopSession(""); | 877 CrosLibrary::Get()->GetLoginLibrary()->StopSession(""); |
877 } | 878 } |
878 | 879 |
879 // Don't hide yet the locker because the chrome screen may become visible | 880 // Don't hide yet the locker because the chrome screen may become visible |
880 // briefly. | 881 // briefly. |
881 } | 882 } |
882 } | 883 } |
883 | 884 |
884 void ScreenLocker::ShowCaptchaAndErrorMessage(const GURL& captcha_url, | 885 void ScreenLocker::ShowCaptchaAndErrorMessage(const GURL& captcha_url, |
(...skipping 230 matching lines...) Loading... |
1115 | 1116 |
1116 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) { | 1117 bool ScreenLocker::AcceleratorPressed(const views::Accelerator& accelerator) { |
1117 if (!background_view_->IsScreenSaverVisible()) { | 1118 if (!background_view_->IsScreenSaverVisible()) { |
1118 StartScreenSaver(); | 1119 StartScreenSaver(); |
1119 return true; | 1120 return true; |
1120 } | 1121 } |
1121 return false; | 1122 return false; |
1122 } | 1123 } |
1123 | 1124 |
1124 } // namespace chromeos | 1125 } // namespace chromeos |
OLD | NEW |