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

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

Issue 10703081: chromeos: Remove references to UnlockScreenFailed signal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.cc ('k') | chromeos/dbus/power_manager_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/system/audio/audio_observer.h" 9 #include "ash/system/audio/audio_observer.h"
10 #include "ash/system/bluetooth/bluetooth_observer.h" 10 #include "ash/system/bluetooth/bluetooth_observer.h"
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 ash::Shell::GetInstance()->status_area_widget()-> 956 ash::Shell::GetInstance()->status_area_widget()->
957 UpdateAfterLoginStatusChange(GetUserLoginStatus()); 957 UpdateAfterLoginStatusChange(GetUserLoginStatus());
958 } 958 }
959 959
960 virtual void UnlockScreen() OVERRIDE { 960 virtual void UnlockScreen() OVERRIDE {
961 screen_locked_ = false; 961 screen_locked_ = false;
962 ash::Shell::GetInstance()->status_area_widget()-> 962 ash::Shell::GetInstance()->status_area_widget()->
963 UpdateAfterLoginStatusChange(GetUserLoginStatus()); 963 UpdateAfterLoginStatusChange(GetUserLoginStatus());
964 } 964 }
965 965
966 virtual void UnlockScreenFailed() OVERRIDE {
967 }
968
969 // TODO(sad): Override more from PowerManagerClient::Observer here (e.g. 966 // TODO(sad): Override more from PowerManagerClient::Observer here (e.g.
970 // PowerButtonStateChanged etc.). 967 // PowerButtonStateChanged etc.).
971 968
972 // Overridden from NetworkMenuIcon::Delegate. 969 // Overridden from NetworkMenuIcon::Delegate.
973 virtual void NetworkMenuIconChanged() OVERRIDE { 970 virtual void NetworkMenuIconChanged() OVERRIDE {
974 NotifyRefreshNetwork(); 971 NotifyRefreshNetwork();
975 } 972 }
976 973
977 // Overridden from NetworkMenu::Delegate. 974 // Overridden from NetworkMenu::Delegate.
978 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE { 975 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE {
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1243 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1247 }; 1244 };
1248 1245
1249 } // namespace 1246 } // namespace
1250 1247
1251 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { 1248 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
1252 return new chromeos::SystemTrayDelegate(tray); 1249 return new chromeos::SystemTrayDelegate(tray);
1253 } 1250 }
1254 1251
1255 } // namespace chromeos 1252 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.cc ('k') | chromeos/dbus/power_manager_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698