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

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 23694025: Remove calls to deprecated session_manager DBus methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix use-after-free in tests. Created 7 years, 3 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/chromeos/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 GetSystemTrayNotifier()->NotifyRefreshClock(); 1084 GetSystemTrayNotifier()->NotifyRefreshClock();
1085 } 1085 }
1086 1086
1087 // Overridden from SessionManagerClient::Observer. 1087 // Overridden from SessionManagerClient::Observer.
1088 virtual void LockScreen() OVERRIDE { 1088 virtual void LockScreen() OVERRIDE {
1089 screen_locked_ = true; 1089 screen_locked_ = true;
1090 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange( 1090 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
1091 GetUserLoginStatus()); 1091 GetUserLoginStatus());
1092 } 1092 }
1093 1093
1094 virtual void UnlockScreen() OVERRIDE { 1094 virtual void ScreenIsUnlocked() OVERRIDE {
1095 screen_locked_ = false; 1095 screen_locked_ = false;
1096 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange( 1096 ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
1097 GetUserLoginStatus()); 1097 GetUserLoginStatus());
1098 } 1098 }
1099 1099
1100 // TODO(sad): Override more from PowerManagerClient::Observer here. 1100 // TODO(sad): Override more from PowerManagerClient::Observer here.
1101 1101
1102 gfx::NativeWindow GetNativeWindow() const { 1102 gfx::NativeWindow GetNativeWindow() const {
1103 return GetNativeWindowByStatus(GetUserLoginStatus()); 1103 return GetNativeWindowByStatus(GetUserLoginStatus());
1104 } 1104 }
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
1325 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1325 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1326 }; 1326 };
1327 1327
1328 } // namespace 1328 } // namespace
1329 1329
1330 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1330 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1331 return new chromeos::SystemTrayDelegate(); 1331 return new chromeos::SystemTrayDelegate();
1332 } 1332 }
1333 1333
1334 } // namespace chromeos 1334 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_test_helper.cc ('k') | chromeos/dbus/fake_session_manager_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698