| Index: chrome/browser/chromeos/login/screen_locker.cc
|
| ===================================================================
|
| --- chrome/browser/chromeos/login/screen_locker.cc (revision 63306)
|
| +++ chrome/browser/chromeos/login/screen_locker.cc (working copy)
|
| @@ -75,7 +75,7 @@
|
| }
|
|
|
| virtual void LockScreen(chromeos::ScreenLockLibrary* obj) {
|
| - LOG(INFO) << "In: ScreenLockObserver::LockScreen";
|
| + VLOG(1) << "In: ScreenLockObserver::LockScreen";
|
| SetupInputMethodsForScreenLocker();
|
| chromeos::ScreenLocker::Show();
|
| }
|
| @@ -196,7 +196,7 @@
|
| }
|
|
|
| virtual void OnDestroy(GtkWidget* object) {
|
| - LOG(INFO) << "OnDestroy: LockWindow destroyed";
|
| + VLOG(1) << "OnDestroy: LockWindow destroyed";
|
| views::WidgetGtk::OnDestroy(object);
|
| }
|
|
|
| @@ -320,7 +320,7 @@
|
| << "Failed to grab keyboard input:" << kbd_grab_status_;
|
| CHECK_EQ(GDK_GRAB_SUCCESS, mouse_grab_status_)
|
| << "Failed to grab pointer input:" << mouse_grab_status_;
|
| - DLOG(INFO) << "Grab Success";
|
| + DVLOG(1) << "Grab Success";
|
| screen_locker_->OnGrabInputs();
|
| }
|
| }
|
| @@ -570,7 +570,7 @@
|
| }
|
|
|
| void ScreenLocker::OnLoginFailure(const LoginFailure& error) {
|
| - DLOG(INFO) << "OnLoginFailure";
|
| + DVLOG(1) << "OnLoginFailure";
|
| EnableInput();
|
| // Don't enable signout button here as we're showing
|
| // MessageBubble.
|
| @@ -613,7 +613,7 @@
|
| const std::string& username,
|
| const GaiaAuthConsumer::ClientLoginResult& unused,
|
| bool pending_requests) {
|
| - LOG(INFO) << "OnLoginSuccess: Sending Unlock request.";
|
| + VLOG(1) << "OnLoginSuccess: Sending Unlock request.";
|
| if (CrosLibrary::Get()->EnsureLoaded())
|
| CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenUnlockRequested();
|
| }
|
| @@ -666,7 +666,7 @@
|
| }
|
|
|
| void ScreenLocker::OnGrabInputs() {
|
| - DLOG(INFO) << "OnGrabInputs";
|
| + DVLOG(1) << "OnGrabInputs";
|
| input_grabbed_ = true;
|
| if (drawn_)
|
| ScreenLockReady();
|
| @@ -674,7 +674,7 @@
|
|
|
| // static
|
| void ScreenLocker::Show() {
|
| - LOG(INFO) << "In ScreenLocker::Show";
|
| + VLOG(1) << "In ScreenLocker::Show";
|
| DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
|
|
|
| // Exit fullscreen.
|
| @@ -686,7 +686,7 @@
|
| }
|
|
|
| if (!screen_locker_) {
|
| - LOG(INFO) << "Show: Locking screen";
|
| + VLOG(1) << "Show: Locking screen";
|
| ScreenLocker* locker =
|
| new ScreenLocker(UserManager::Get()->logged_in_user());
|
| locker->Init();
|
| @@ -694,8 +694,7 @@
|
| // PowerManager re-sends lock screen signal if it doesn't
|
| // receive the response within timeout. Just send complete
|
| // signal.
|
| - LOG(INFO) << "Show: locker already exists. "
|
| - << "just sending completion event";
|
| + VLOG(1) << "Show: locker already exists. Just sending completion event.";
|
| if (CrosLibrary::Get()->EnsureLoaded())
|
| CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
|
| }
|
| @@ -705,7 +704,7 @@
|
| void ScreenLocker::Hide() {
|
| DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
|
| DCHECK(screen_locker_);
|
| - LOG(INFO) << "Hide: Deleting ScreenLocker:" << screen_locker_;
|
| + VLOG(1) << "Hide: Deleting ScreenLocker: " << screen_locker_;
|
| MessageLoopForUI::current()->DeleteSoon(FROM_HERE, screen_locker_);
|
| }
|
|
|
| @@ -716,14 +715,14 @@
|
| // Power manager decided no to unlock the screen even if a user
|
| // typed in password, for example, when a user closed the lid
|
| // immediately after typing in the password.
|
| - LOG(INFO) << "UnlockScreenFailed: re-enabling screen locker";
|
| + VLOG(1) << "UnlockScreenFailed: re-enabling screen locker.";
|
| screen_locker_->EnableInput();
|
| } else {
|
| // This can happen when a user requested unlock, but PowerManager
|
| // rejected because the computer is closed, then PowerManager unlocked
|
| // because it's open again and the above failure message arrives.
|
| // This'd be extremely rare, but may still happen.
|
| - LOG(INFO) << "UnlockScreenFailed: screen is already unlocked.";
|
| + VLOG(1) << "UnlockScreenFailed: screen is already unlocked.";
|
| }
|
| }
|
|
|
| @@ -751,7 +750,7 @@
|
| gdk_pointer_ungrab(GDK_CURRENT_TIME);
|
|
|
| DCHECK(lock_window_);
|
| - LOG(INFO) << "~ScreenLocker(): Closing ScreenLocker window";
|
| + VLOG(1) << "~ScreenLocker(): Closing ScreenLocker window.";
|
| lock_window_->Close();
|
| // lock_widget_ will be deleted by gtk's destroy signal.
|
| screen_locker_ = NULL;
|
| @@ -769,7 +768,7 @@
|
| }
|
|
|
| void ScreenLocker::ScreenLockReady() {
|
| - LOG(INFO) << "ScreenLockReady: sending completed signal to power manager.";
|
| + VLOG(1) << "ScreenLockReady: sending completed signal to power manager.";
|
| locked_ = true;
|
| if (background_view_->ScreenSaverEnabled()) {
|
| lock_widget_->GetFocusManager()->RegisterAccelerator(
|
| @@ -800,7 +799,7 @@
|
| }
|
|
|
| void ScreenLocker::OnWindowManagerReady() {
|
| - DLOG(INFO) << "OnClientEvent: drawn for lock";
|
| + DVLOG(1) << "OnClientEvent: drawn for lock";
|
| drawn_ = true;
|
| if (input_grabbed_)
|
| ScreenLockReady();
|
| @@ -808,7 +807,7 @@
|
|
|
| void ScreenLocker::StopScreenSaver() {
|
| if (background_view_->IsScreenSaverVisible()) {
|
| - LOG(INFO) << "StopScreenSaver";
|
| + VLOG(1) << "StopScreenSaver";
|
| background_view_->HideScreenSaver();
|
| if (screen_lock_view_) {
|
| screen_lock_view_->SetVisible(true);
|
| @@ -820,7 +819,7 @@
|
|
|
| void ScreenLocker::StartScreenSaver() {
|
| if (!background_view_->IsScreenSaverVisible()) {
|
| - LOG(INFO) << "StartScreenSaver";
|
| + VLOG(1) << "StartScreenSaver";
|
| background_view_->ShowScreenSaver();
|
| if (screen_lock_view_) {
|
| screen_lock_view_->SetEnabled(false);
|
|
|