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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2492063002: chromeos: Simplify ShutdownPolicyHandler
Patch Set: unused typedef Created 4 years, 1 month 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ash/system_tray_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 void SystemTrayDelegateChromeOS::AddShutdownPolicyObserver( 592 void SystemTrayDelegateChromeOS::AddShutdownPolicyObserver(
593 ash::ShutdownPolicyObserver* observer) { 593 ash::ShutdownPolicyObserver* observer) {
594 shutdown_policy_observers_.AddObserver(observer); 594 shutdown_policy_observers_.AddObserver(observer);
595 } 595 }
596 596
597 void SystemTrayDelegateChromeOS::RemoveShutdownPolicyObserver( 597 void SystemTrayDelegateChromeOS::RemoveShutdownPolicyObserver(
598 ash::ShutdownPolicyObserver* observer) { 598 ash::ShutdownPolicyObserver* observer) {
599 shutdown_policy_observers_.RemoveObserver(observer); 599 shutdown_policy_observers_.RemoveObserver(observer);
600 } 600 }
601 601
602 void SystemTrayDelegateChromeOS::ShouldRebootOnShutdown( 602 void SystemTrayDelegateChromeOS::CheckIfRebootOnShutdown() {
603 const ash::RebootOnShutdownCallback& callback) { 603 shutdown_policy_handler_->CheckIfRebootOnShutdown();
604 shutdown_policy_handler_->CheckIfRebootOnShutdown(callback);
605 } 604 }
606 605
607 ash::VPNDelegate* SystemTrayDelegateChromeOS::GetVPNDelegate() const { 606 ash::VPNDelegate* SystemTrayDelegateChromeOS::GetVPNDelegate() const {
608 return vpn_delegate_.get(); 607 return vpn_delegate_.get();
609 } 608 }
610 609
611 std::unique_ptr<ash::SystemTrayItem> 610 std::unique_ptr<ash::SystemTrayItem>
612 SystemTrayDelegateChromeOS::CreateRotationLockTrayItem(ash::SystemTray* tray) { 611 SystemTrayDelegateChromeOS::CreateRotationLockTrayItem(ash::SystemTray* tray) {
613 return base::MakeUnique<ash::TrayRotationLock>(tray); 612 return base::MakeUnique<ash::TrayRotationLock>(tray);
614 } 613 }
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1053 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1055 << "ENABLE_SUPERVISED_USERS undefined."; 1054 << "ENABLE_SUPERVISED_USERS undefined.";
1056 return base::string16(); 1055 return base::string16();
1057 } 1056 }
1058 1057
1059 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1058 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1060 return new SystemTrayDelegateChromeOS(); 1059 return new SystemTrayDelegateChromeOS();
1061 } 1060 }
1062 1061
1063 } // namespace chromeos 1062 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698