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 <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
11 #include "app/resource_bundle.h" | 11 #include "app/resource_bundle.h" |
12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
13 #include "base/singleton.h" | 13 #include "base/singleton.h" |
14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 16 #include "chrome/browser/browser.h" |
16 #include "chrome/browser/browser_list.h" | 17 #include "chrome/browser/browser_list.h" |
| 18 #include "chrome/browser/browser_window.h" |
17 #include "chrome/browser/chromeos/cros/input_method_library.h" | 19 #include "chrome/browser/chromeos/cros/input_method_library.h" |
18 #include "chrome/browser/chromeos/cros/screen_lock_library.h" | 20 #include "chrome/browser/chromeos/cros/screen_lock_library.h" |
19 #include "chrome/browser/chromeos/language_preferences.h" | 21 #include "chrome/browser/chromeos/language_preferences.h" |
20 #include "chrome/browser/chromeos/login/authenticator.h" | 22 #include "chrome/browser/chromeos/login/authenticator.h" |
21 #include "chrome/browser/chromeos/login/background_view.h" | 23 #include "chrome/browser/chromeos/login/background_view.h" |
22 #include "chrome/browser/chromeos/login/login_utils.h" | 24 #include "chrome/browser/chromeos/login/login_utils.h" |
23 #include "chrome/browser/chromeos/login/message_bubble.h" | 25 #include "chrome/browser/chromeos/login/message_bubble.h" |
24 #include "chrome/browser/chromeos/login/screen_lock_view.h" | 26 #include "chrome/browser/chromeos/login/screen_lock_view.h" |
25 #include "chrome/browser/chromeos/wm_ipc.h" | 27 #include "chrome/browser/chromeos/wm_ipc.h" |
26 #include "chrome/browser/metrics/user_metrics.h" | 28 #include "chrome/browser/metrics/user_metrics.h" |
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
573 void ScreenLocker::OnGrabInputs() { | 575 void ScreenLocker::OnGrabInputs() { |
574 DLOG(INFO) << "OnGrabInputs"; | 576 DLOG(INFO) << "OnGrabInputs"; |
575 input_grabbed_ = true; | 577 input_grabbed_ = true; |
576 if (drawn_) | 578 if (drawn_) |
577 ScreenLockReady(); | 579 ScreenLockReady(); |
578 } | 580 } |
579 | 581 |
580 // static | 582 // static |
581 void ScreenLocker::Show() { | 583 void ScreenLocker::Show() { |
582 DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI); | 584 DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI); |
| 585 |
| 586 // Exit fullscreen. |
| 587 Browser* browser = BrowserList::GetLastActive(); |
| 588 DCHECK(browser); |
| 589 if (browser->window()->IsFullscreen()) { |
| 590 browser->ToggleFullscreenMode(); |
| 591 } |
| 592 |
583 // TODO(oshima): Currently, PowerManager may send a lock screen event | 593 // TODO(oshima): Currently, PowerManager may send a lock screen event |
584 // even if a screen is locked. Investigate & solve the issue and | 594 // even if a screen is locked. Investigate & solve the issue and |
585 // enable this again if it's possible. | 595 // enable this again if it's possible. |
586 // DCHECK(!screen_locker_); | 596 // DCHECK(!screen_locker_); |
587 if (!screen_locker_) { | 597 if (!screen_locker_) { |
588 ScreenLocker* locker = | 598 ScreenLocker* locker = |
589 new ScreenLocker(UserManager::Get()->logged_in_user()); | 599 new ScreenLocker(UserManager::Get()->logged_in_user()); |
590 locker->Init(); | 600 locker->Init(); |
591 } else { | 601 } else { |
592 LOG(INFO) << "Show(): screen locker already exists. ignoring"; | 602 LOG(INFO) << "Show(): screen locker already exists. ignoring"; |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
673 } | 683 } |
674 | 684 |
675 void ScreenLocker::OnWindowManagerReady() { | 685 void ScreenLocker::OnWindowManagerReady() { |
676 DLOG(INFO) << "OnClientEvent: drawn for lock"; | 686 DLOG(INFO) << "OnClientEvent: drawn for lock"; |
677 drawn_ = true; | 687 drawn_ = true; |
678 if (input_grabbed_) | 688 if (input_grabbed_) |
679 ScreenLockReady(); | 689 ScreenLockReady(); |
680 } | 690 } |
681 | 691 |
682 } // namespace chromeos | 692 } // namespace chromeos |
OLD | NEW |