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

Issue 8774035: Revert "chromeos: move screen lock handling to power manager client" (Closed)

Created:
9 years ago by Simon Que
Modified:
9 years ago
CC:
chromium-reviews, nkostylev+watch_chromium.org, hashimoto+watch_chromium.org, aboxhall+watch_chromium.org, yoshiki+watch_chromium.org, kkania, yuzo+watch_chromium.org, davidbarr+watch_chromium.org, robertshield, dmazzoni+watch_chromium.org, dtseng+watch_chromium.org, Paweł Hajdan Jr., ctguil+watch_chromium.org, stevenjb+watch_chromium.org, davemoore+watch_chromium.org, zork+watch_chromium.org
Visibility:
Public.

Description

Revert "chromeos: move screen lock handling to power manager client" This reverts commit f9f5f14c3ecf810409509b92a0b694850050e74e. Revert "Move chromeos specific code to ChromeBrowserMainPartsChromeos" This reverts commit 922cff9cd081e3ae327b52d3cc6bd8423307dee0. Revert "chromeos: remove power manager EXPECTs from login_browsertest" This reverts commit 0a9298b6333f5a373ddd316978f0aa469ef20ce7. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=112651

Patch Set 1 #

Patch Set 2 : Fixed compile errors #

Patch Set 3 : Reverted 3 patches in correct order, without conflict #

Unified diffs Side-by-side diffs Delta from patch set Stats (+321 lines, -479 lines) Patch
M chrome/browser/automation/testing_automation_provider_chromeos.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/chrome_browser_main.h View 1 2 3 chunks +0 lines, -11 lines 0 comments Download
M chrome/browser/chrome_browser_main.cc View 1 2 16 chunks +248 lines, -41 lines 0 comments Download
M chrome/browser/chrome_browser_main_extra_parts.h View 1 2 1 chunk +2 lines, -4 lines 0 comments Download
M chrome/browser/chrome_browser_main_extra_parts.cc View 1 2 1 chunk +2 lines, -8 lines 0 comments Download
M chrome/browser/chrome_browser_main_extra_parts_aura.h View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/chrome_browser_main_extra_parts_aura.cc View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/chromeos/accessibility/system_event_observer.h View 3 chunks +7 lines, -4 lines 0 comments Download
M chrome/browser/chromeos/accessibility/system_event_observer.cc View 3 chunks +9 lines, -3 lines 0 comments Download
M chrome/browser/chromeos/chrome_browser_main_chromeos.h View 1 2 1 chunk +1 line, -6 lines 0 comments Download
M chrome/browser/chromeos/chrome_browser_main_chromeos.cc View 1 2 8 chunks +6 lines, -271 lines 0 comments Download
M chrome/browser/chromeos/dbus/mock_power_manager_client.h View 1 chunk +0 lines, -4 lines 0 comments Download
M chrome/browser/chromeos/dbus/power_manager_client.h View 2 chunks +0 lines, -21 lines 0 comments Download
M chrome/browser/chromeos/dbus/power_manager_client.cc View 5 chunks +0 lines, -69 lines 0 comments Download
M chrome/browser/chromeos/login/login_browsertest.cc View 4 chunks +12 lines, -1 line 0 comments Download
M chrome/browser/chromeos/login/login_performer.cc View 3 chunks +4 lines, -4 lines 0 comments Download
M chrome/browser/chromeos/login/screen_locker.cc View 7 chunks +11 lines, -15 lines 0 comments Download
M chrome/browser/chromeos/login/screen_locker_browsertest.cc View 7 chunks +15 lines, -13 lines 0 comments Download

Messages

Total messages: 12 (0 generated)
Simon Que
9 years ago (2011-12-02 02:37:01 UTC) #1
kochi
LGTM please run trybot and make sure this compiles.
9 years ago (2011-12-02 02:49:17 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/sque@chromium.org/8774035/13
9 years ago (2011-12-02 04:33:10 UTC) #3
commit-bot: I haz the power
Presubmit check for 8774035-13 failed and returned exit status 1. Running presubmit commit checks ...
9 years ago (2011-12-02 04:33:16 UTC) #4
satorux1
LGTM so you can revert...
9 years ago (2011-12-02 05:22:55 UTC) #5
kochi
lgtm
9 years ago (2011-12-02 06:34:55 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/sque@chromium.org/8774035/2004
9 years ago (2011-12-02 06:35:07 UTC) #7
commit-bot: I haz the power
Change committed as 112651
9 years ago (2011-12-02 07:53:17 UTC) #8
Nikita (slow)
Please don't forget to run linux_chromeos_clang trybot. This change breaks linux_chromeos_clang buildbot http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20Clang%20%28ChromeOS%20dbg%29/builds/3829/steps/compile/logs/stdio#error1
9 years ago (2011-12-02 11:23:26 UTC) #9
stevenjb
Why was 922cff9cd081e3ae327b52d3cc6bd8423307dee0 reverted with these??? There is no explanation here and I was not ...
9 years ago (2011-12-16 22:20:27 UTC) #10
satorux1
On 2011/12/16 22:20:27, stevenjb wrote: > Why was 922cff9cd081e3ae327b52d3cc6bd8423307dee0 reverted with these??? There is > ...
9 years ago (2011-12-16 23:01:35 UTC) #11
satorux1
9 years ago (2011-12-16 23:08:00 UTC) #12
On 2011/12/16 23:01:35, satorux1 wrote:
> On 2011/12/16 22:20:27, stevenjb wrote:
> > Why was 922cff9cd081e3ae327b52d3cc6bd8423307dee0 reverted with these???
There
> is
> > no explanation here and I was not added as a reviewer. This re-factoring CL
> took
> > me about a week to land and it will probably take me at least a day to
> > re-introduce the cleanup work here.
> 
> Ugh, I wasn't aware that your patch was included in this when I sent L-G-T-M.
I
> thought he was only reverting  "chromeos: move screen lock handling to power
> manager client" per the title. IIRC, the revert was needed to fix a
regression,
> but I don't know if it was necessary to revert your patch as well...

Per http://codereview.chromium.org/8664014/, the original patch broke the
linux_chromeos build. stevenjb's patch should be unrelated... Steven, I'm very
sorry about the horrible mess. I should've looked at this patch more carefully,
even though it looked like a simple revert...

Powered by Google App Engine
This is Rietveld 408576698