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

Side by Side Diff: chrome/browser/chromeos/login/webui_screen_locker.cc

Issue 240343004: chromeos: Update IdleActionImminent and SuspendDone handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/webui_screen_locker.h" 5 #include "chrome/browser/chromeos/login/webui_screen_locker.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wm/lock_state_controller.h" 8 #include "ash/wm/lock_state_controller.h"
9 #include "ash/wm/lock_state_observer.h" 9 #include "ash/wm/lock_state_observer.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 // PowerManagerClient::Observer overrides. 340 // PowerManagerClient::Observer overrides.
341 341
342 void WebUIScreenLocker::LidEventReceived(bool open, 342 void WebUIScreenLocker::LidEventReceived(bool open,
343 const base::TimeTicks& time) { 343 const base::TimeTicks& time) {
344 content::BrowserThread::PostTask( 344 content::BrowserThread::PostTask(
345 content::BrowserThread::UI, 345 content::BrowserThread::UI,
346 FROM_HERE, 346 FROM_HERE,
347 base::Bind(&WebUIScreenLocker::FocusUserPod, weak_factory_.GetWeakPtr())); 347 base::Bind(&WebUIScreenLocker::FocusUserPod, weak_factory_.GetWeakPtr()));
348 } 348 }
349 349
350 void WebUIScreenLocker::SystemResumed(const base::TimeDelta& sleep_duration) { 350 void WebUIScreenLocker::SuspendDone(const base::TimeDelta& sleep_duration) {
351 content::BrowserThread::PostTask( 351 content::BrowserThread::PostTask(
352 content::BrowserThread::UI, 352 content::BrowserThread::UI,
353 FROM_HERE, 353 FROM_HERE,
354 base::Bind(&WebUIScreenLocker::FocusUserPod, weak_factory_.GetWeakPtr())); 354 base::Bind(&WebUIScreenLocker::FocusUserPod, weak_factory_.GetWeakPtr()));
355 } 355 }
356 356
357 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) { 357 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) {
358 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID && 358 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID &&
359 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) { 359 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) {
360 LOG(ERROR) << "Renderer crash on lock screen"; 360 LOG(ERROR) << "Renderer crash on lock screen";
361 Signout(); 361 Signout();
362 } 362 }
363 } 363 }
364 364
365 } // namespace chromeos 365 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698