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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.cc

Issue 10693087: chromeos: Request screen lock directly from session manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove locking-related metrics code Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/launcher/launcher_types.h" 7 #include "ash/launcher/launcher_types.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/wm/partial_screenshot_view.h" 9 #include "ash/wm/partial_screenshot_view.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 29 matching lines...) Expand all
40 #include "chrome/browser/chromeos/extensions/file_manager_util.h" 40 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
41 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 41 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
42 #include "chrome/browser/chromeos/login/user_manager.h" 42 #include "chrome/browser/chromeos/login/user_manager.h"
43 #include "chrome/browser/chromeos/login/webui_login_display_host.h" 43 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
44 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" 44 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
45 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h" 45 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
46 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 46 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
47 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" 47 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
48 #include "chromeos/dbus/dbus_thread_manager.h" 48 #include "chromeos/dbus/dbus_thread_manager.h"
49 #include "chromeos/dbus/power_manager_client.h" 49 #include "chromeos/dbus/power_manager_client.h"
50 #include "chromeos/dbus/session_manager_client.h"
50 #endif 51 #endif
51 52
52 namespace { 53 namespace {
53 54
54 // Returns the browser that should handle accelerators. 55 // Returns the browser that should handle accelerators.
55 Browser* GetTargetBrowser() { 56 Browser* GetTargetBrowser() {
56 Browser* browser = browser::FindBrowserWithWindow(ash::wm::GetActiveWindow()); 57 Browser* browser = browser::FindBrowserWithWindow(ash::wm::GetActiveWindow());
57 if (browser) 58 if (browser)
58 return browser; 59 return browser;
59 return browser::FindOrCreateTabbedBrowser( 60 return browser::FindOrCreateTabbedBrowser(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 return chromeos::UserManager::Get()->IsUserLoggedIn(); 96 return chromeos::UserManager::Get()->IsUserLoggedIn();
96 #else 97 #else
97 return true; 98 return true;
98 #endif 99 #endif
99 } 100 }
100 101
101 void ChromeShellDelegate::LockScreen() { 102 void ChromeShellDelegate::LockScreen() {
102 #if defined(OS_CHROMEOS) 103 #if defined(OS_CHROMEOS)
103 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession) && 104 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession) &&
104 !chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) { 105 !chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
105 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> 106 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
106 NotifyScreenLockRequested(); 107 RequestLockScreen();
107 } 108 }
108 #endif 109 #endif
109 } 110 }
110 111
111 void ChromeShellDelegate::UnlockScreen() { 112 void ChromeShellDelegate::UnlockScreen() {
112 // This is used only for testing thus far. 113 // This is used only for testing thus far.
113 NOTIMPLEMENTED(); 114 NOTIMPLEMENTED();
114 } 115 }
115 116
116 bool ChromeShellDelegate::IsScreenLocked() const { 117 bool ChromeShellDelegate::IsScreenLocked() const {
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 ash::Shell::GetInstance()->CreateLauncher(); 333 ash::Shell::GetInstance()->CreateLauncher();
333 break; 334 break;
334 default: 335 default:
335 NOTREACHED() << "Unexpected notification " << type; 336 NOTREACHED() << "Unexpected notification " << type;
336 } 337 }
337 #else 338 #else
338 // MSVC++ warns about switch statements without any cases. 339 // MSVC++ warns about switch statements without any cases.
339 NOTREACHED() << "Unexpected notification " << type; 340 NOTREACHED() << "Unexpected notification " << type;
340 #endif 341 #endif
341 } 342 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chromeos/dbus/mock_power_manager_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698