diff options
| author | oritm@chromium.org <oritm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 21:43:18 +0000 |
|---|---|---|
| committer | oritm@chromium.org <oritm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 21:43:18 +0000 |
| commit | 00d801524b66f6ccccb8ce0d4ce72de2f39c744c (patch) | |
| tree | 3c2546e68bd0152240110e9bb7feb45c648c05e1 /chrome/browser/automation/testing_automation_provider_chromeos.cc | |
| parent | 58dd344ef68f40f313d8c9c736b177960803ab19 (diff) | |
| download | chromium_src-00d801524b66f6ccccb8ce0d4ce72de2f39c744c.zip chromium_src-00d801524b66f6ccccb8ce0d4ce72de2f39c744c.tar.gz chromium_src-00d801524b66f6ccccb8ce0d4ce72de2f39c744c.tar.bz2 | |
Merge 112651 - 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.
Review URL: http://codereview.chromium.org/8774035
TBR=sque@chromium.org
Review URL: http://codereview.chromium.org/8772056
git-svn-id: svn://svn.chromium.org/chrome/branches/958/src@112794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/testing_automation_provider_chromeos.cc')
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider_chromeos.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc index 2ffc792..b4d65dc 100644 --- a/chrome/browser/automation/testing_automation_provider_chromeos.cc +++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc @@ -15,8 +15,8 @@ #include "chrome/browser/chromeos/audio_handler.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" +#include "chrome/browser/chromeos/cros/screen_lock_library.h" #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" -#include "chrome/browser/chromeos/dbus/power_manager_client.h" #include "chrome/browser/chromeos/dbus/update_engine_client.h" #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h" #include "chrome/browser/chromeos/login/existing_user_controller.h" @@ -276,7 +276,7 @@ void TestingAutomationProvider::Login(DictionaryValue* args, void TestingAutomationProvider::LockScreen(DictionaryValue* args, IPC::Message* reply_message) { new ScreenLockUnlockObserver(this, reply_message, true); - DBusThreadManager::Get()->GetPowerManagerClient()-> + CrosLibrary::Get()->GetScreenLockLibrary()-> NotifyScreenLockRequested(); } |