Chromium Code Reviews| Index: chrome/browser/ui/views/ash/chrome_shell_delegate.cc |
| =================================================================== |
| --- chrome/browser/ui/views/ash/chrome_shell_delegate.cc (revision 127786) |
| +++ chrome/browser/ui/views/ash/chrome_shell_delegate.cc (working copy) |
| @@ -9,6 +9,8 @@ |
| #include "ash/wm/partial_screenshot_view.h" |
| #include "ash/wm/window_util.h" |
| #include "base/command_line.h" |
| +#include "chrome/browser/browser_process.h" |
| +#include "chrome/browser/chromeos/login/screen_locker.h" |
| #include "chrome/browser/ui/browser.h" |
| #include "chrome/browser/ui/browser_list.h" |
| #include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h" |
| @@ -45,6 +47,7 @@ |
| ChromeShellDelegate::ChromeShellDelegate() { |
| instance_ = this; |
| + g_browser_process->AddRefModule(); |
|
sky
2012/03/21 22:26:26
Remove this.
|
| } |
| ChromeShellDelegate::~ChromeShellDelegate() { |
| @@ -63,14 +66,27 @@ |
| return status_area_widget; |
| } |
| +void ChromeShellDelegate::LockScreen() { |
| #if defined(OS_CHROMEOS) |
| -void ChromeShellDelegate::LockScreen() { |
| if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) { |
| chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> |
| NotifyScreenLockRequested(); |
| } |
| +#endif |
| } |
| + |
| +void ChromeShellDelegate::UnlockScreen() { |
| + // This is used only for testing thus far. |
| + NOTIMPLEMENTED(); |
| +} |
| + |
| +bool ChromeShellDelegate::IsScreenLocked() const { |
| +#if defined(OS_CHROMEOS) |
| + return chromeos::ScreenLocker::default_screen_locker()->locked(); |
| +#else |
| + return false; |
| #endif |
| +} |
| void ChromeShellDelegate::Exit() { |
| BrowserList::AttemptUserExit(); |