diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 08:53:40 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 08:53:40 +0000 |
commit | 7a2b2d466bab5c1e8ae730b389d7626c8ad058e6 (patch) | |
tree | 62f16382b9f7953414b5431291da2c6536b04372 /chrome/browser/browser_main.cc | |
parent | ee857513c3a0d5c88bfd363c4203d4190fc678f5 (diff) | |
download | chromium_src-7a2b2d466bab5c1e8ae730b389d7626c8ad058e6.zip chromium_src-7a2b2d466bab5c1e8ae730b389d7626c8ad058e6.tar.gz chromium_src-7a2b2d466bab5c1e8ae730b389d7626c8ad058e6.tar.bz2 |
Revert "Hook up ScreenLocker to screen lock cros library."
This reverts commit ffa6827263fb5e6b4017a5f1655b683c806498fd.
TBR=dpolukhin@chromium.org
Review URL: http://codereview.chromium.org/2126002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
-rw-r--r-- | chrome/browser/browser_main.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 5d05685..c32e0d1 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -143,9 +143,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/cros/cros_library.h" -#include "chrome/browser/chromeos/cros/screen_lock_library.h" #include "chrome/browser/chromeos/external_metrics.h" -#include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/views/browser_dialogs.h" #endif @@ -605,7 +603,6 @@ void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) { } browser::ShowLoginWizard(first_screen, size); } - chromeos::ScreenLocker::InitClass(); } #else void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) { |