Issue 11185006: Revert 162140 - ash : Decouple power button controller and session state controller.

Issue 11185006: Revert 162140 - ash : Decouple power button controller and session state controller. (Closed)

Created:
8 years, 2 months ago by mattm

Modified:
8 years, 2 months ago

Reviewers:
Denis Kuznetsov (DE-MUC)

CC:
chromium-reviews, sadrul, nkostylev+watch_chromium.org, ben+watch_chromium.org, oshima+watch_chromium.org, stevenjb+watch_chromium.org, davemoore+watch_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/src/

Visibility:
Public.

More Reviews

Description

Revert 162140 - ash : Decouple power button controller and session state controller. Prepare code to introduce two versions of SessionStateController later. BUG=138171, 139461 Review URL: https://chromiumcodereview.appspot.com/11091023 TBR=antrim@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=162201

Patch Set 1 #

Created: 8 years, 2 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+601 lines, -871 lines)			Patch
M	ash/ash.gyp	View	1 chunk	+0 lines, -2 lines	0 comments	Download
M	ash/shell.h	View	3 chunks	+0 lines, -5 lines	0 comments	Download
M	ash/shell.cc	View	3 chunks	+2 lines, -6 lines	0 comments	Download
M	ash/wm/power_button_controller.h	View	4 chunks	+172 lines, -8 lines	0 comments	Download
M	ash/wm/power_button_controller.cc	View	3 chunks	+305 lines, -25 lines	0 comments	Download
M	ash/wm/power_button_controller_unittest.cc	View	26 chunks	+115 lines, -125 lines	0 comments	Download
D	ash/wm/session_state_controller.h	View	1 chunk	+0 lines, -277 lines	0 comments	Download
D	ash/wm/session_state_controller.cc	View	1 chunk	+0 lines, -354 lines	0 comments	Download
M	chrome/browser/chromeos/chrome_browser_main_chromeos.cc	View	1 chunk	+1 line, -0 lines	0 comments	Download
A +	chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
A +	chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
M	chrome/browser/chromeos/power/power_button_observer.cc	View	3 chunks	+4 lines, -4 lines	0 comments	Download
D	chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h	View	1 chunk	+0 lines, -30 lines	0 comments	Download
D	chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc	View	1 chunk	+0 lines, -33 lines	0 comments	Download
M	chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc	View	2 chunks	+2 lines, -2 lines	0 comments	Download
M	chrome/chrome_browser_chromeos.gypi	View	2 chunks	+2 lines, -2 lines	0 comments	Download

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

mattm

8 years, 2 months ago (2012-10-16 19:13:22 UTC) #2

Ex:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%2...



[----------] 17 tests from PowerButtonControllerTest
[ RUN      ] PowerButtonControllerTest.LegacyLockAndShutDown
Xlib:  extension "RANDR" missing on display ":9.0".
ash/wm/power_button_controller_unittest.cc:160: Failure
Value of: delegate_->num_shutdown_requests()
  Actual: 0
Expected: 1
[  FAILED  ] PowerButtonControllerTest.LegacyLockAndShutDown (20 ms)
[ RUN      ] PowerButtonControllerTest.LegacyNotLoggedIn
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.LegacyNotLoggedIn (13 ms)
[ RUN      ] PowerButtonControllerTest.LegacyGuest
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.LegacyGuest (18 ms)
[ RUN      ] PowerButtonControllerTest.ShutdownWhenNotLoggedIn
Xlib:  extension "RANDR" missing on display ":9.0".
ash/wm/power_button_controller_unittest.cc:235: Failure
Value of: delegate_->num_shutdown_requests()
  Actual: 0
Expected: 1
[  FAILED  ] PowerButtonControllerTest.ShutdownWhenNotLoggedIn (15 ms)
[ RUN      ] PowerButtonControllerTest.LockAndUnlock
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.LockAndUnlock (21 ms)
[ RUN      ] PowerButtonControllerTest.LockToShutdown
Xlib:  extension "RANDR" missing on display ":9.0".
ash/wm/power_button_controller_unittest.cc:358: Failure
Value of: delegate_->num_shutdown_requests()
  Actual: 0
Expected: 1
[  FAILED  ] PowerButtonControllerTest.LockToShutdown (20 ms)
[ RUN      ] PowerButtonControllerTest.LockFail
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.LockFail (18 ms)
[ RUN      ] PowerButtonControllerTest.CancelHideBackground
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.CancelHideBackground (15 ms)
[ RUN      ] PowerButtonControllerTest.LockButtonBasic
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.LockButtonBasic (15 ms)
[ RUN      ] PowerButtonControllerTest.PowerButtonPreemptsLockButton
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.PowerButtonPreemptsLockButton (19 ms)
[ RUN      ] PowerButtonControllerTest.LockWithoutButton
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.LockWithoutButton (20 ms)
[ RUN      ] PowerButtonControllerTest.ShutdownWithoutButton
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.ShutdownWithoutButton (14 ms)
[ RUN      ] PowerButtonControllerTest.RequestShutdownFromLoginScreen
Xlib:  extension "RANDR" missing on display ":9.0".
ash/wm/power_button_controller_unittest.cc:557: Failure
Value of: delegate_->num_shutdown_requests()
  Actual: 0
Expected: 1
[  FAILED  ] PowerButtonControllerTest.RequestShutdownFromLoginScreen (14 ms)
[ RUN      ] PowerButtonControllerTest.RequestShutdownFromLockScreen
Xlib:  extension "RANDR" missing on display ":9.0".
ash/wm/power_button_controller_unittest.cc:579: Failure
Value of: delegate_->num_shutdown_requests()
  Actual: 0
Expected: 1
[  FAILED  ] PowerButtonControllerTest.RequestShutdownFromLockScreen (17 ms)
[ RUN      ] PowerButtonControllerTest.RequestAndCancelShutdownFromLockScreen
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.RequestAndCancelShutdownFromLockScreen
(16 ms)
[ RUN      ] PowerButtonControllerTest.ResizeBlackLayer
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.ResizeBlackLayer (14 ms)
[ RUN      ] PowerButtonControllerTest.IgnorePowerButtonIfScreenIsOff
Xlib:  extension "RANDR" missing on display ":9.0".
[       OK ] PowerButtonControllerTest.IgnorePowerButtonIfScreenIsOff (20 ms)
[----------] 17 tests from PowerButtonControllerTest (295 ms total)

Expand Messages | Collapse Messages