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

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

Issue 2217713002: Remove the system menu display settings row (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 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
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 16 matching lines...) Expand all
27 #include "ash/common/system/tray/system_tray.h" 27 #include "ash/common/system/tray/system_tray.h"
28 #include "ash/common/system/tray/system_tray_delegate.h" 28 #include "ash/common/system/tray/system_tray_delegate.h"
29 #include "ash/common/system/tray/system_tray_notifier.h" 29 #include "ash/common/system/tray/system_tray_notifier.h"
30 #include "ash/common/system/tray_accessibility.h" 30 #include "ash/common/system/tray_accessibility.h"
31 #include "ash/common/system/update/update_observer.h" 31 #include "ash/common/system/update/update_observer.h"
32 #include "ash/common/system/user/user_observer.h" 32 #include "ash/common/system/user/user_observer.h"
33 #include "ash/common/system/volume_control_delegate.h" 33 #include "ash/common/system/volume_control_delegate.h"
34 #include "ash/common/wm_shell.h" 34 #include "ash/common/wm_shell.h"
35 #include "ash/shell.h" 35 #include "ash/shell.h"
36 #include "ash/system/chromeos/rotation/tray_rotation_lock.h" 36 #include "ash/system/chromeos/rotation/tray_rotation_lock.h"
37 #include "ash/system/chromeos/tray_display.h"
38 #include "ash/wm/lock_state_controller.h" 37 #include "ash/wm/lock_state_controller.h"
39 #include "base/bind_helpers.h" 38 #include "base/bind_helpers.h"
40 #include "base/callback.h" 39 #include "base/callback.h"
41 #include "base/logging.h" 40 #include "base/logging.h"
42 #include "base/memory/ptr_util.h" 41 #include "base/memory/ptr_util.h"
43 #include "base/memory/weak_ptr.h" 42 #include "base/memory/weak_ptr.h"
44 #include "base/strings/stringprintf.h" 43 #include "base/strings/stringprintf.h"
45 #include "base/strings/utf_string_conversions.h" 44 #include "base/strings/utf_string_conversions.h"
46 #include "base/sys_info.h" 45 #include "base/sys_info.h"
47 #include "base/time/time.h" 46 #include "base/time/time.h"
(...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 void SystemTrayDelegateChromeOS::ShouldRebootOnShutdown( 852 void SystemTrayDelegateChromeOS::ShouldRebootOnShutdown(
854 const ash::RebootOnShutdownCallback& callback) { 853 const ash::RebootOnShutdownCallback& callback) {
855 shutdown_policy_handler_->CheckIfRebootOnShutdown(callback); 854 shutdown_policy_handler_->CheckIfRebootOnShutdown(callback);
856 } 855 }
857 856
858 ash::VPNDelegate* SystemTrayDelegateChromeOS::GetVPNDelegate() const { 857 ash::VPNDelegate* SystemTrayDelegateChromeOS::GetVPNDelegate() const {
859 return vpn_delegate_.get(); 858 return vpn_delegate_.get();
860 } 859 }
861 860
862 std::unique_ptr<ash::SystemTrayItem> 861 std::unique_ptr<ash::SystemTrayItem>
863 SystemTrayDelegateChromeOS::CreateDisplayTrayItem(ash::SystemTray* tray) {
864 return base::MakeUnique<ash::TrayDisplay>(tray);
865 }
866
867 std::unique_ptr<ash::SystemTrayItem>
868 SystemTrayDelegateChromeOS::CreateRotationLockTrayItem(ash::SystemTray* tray) { 862 SystemTrayDelegateChromeOS::CreateRotationLockTrayItem(ash::SystemTray* tray) {
869 return base::MakeUnique<ash::TrayRotationLock>(tray); 863 return base::MakeUnique<ash::TrayRotationLock>(tray);
870 } 864 }
871 865
872 void SystemTrayDelegateChromeOS::UserAddedToSession( 866 void SystemTrayDelegateChromeOS::UserAddedToSession(
873 const user_manager::User* active_user) { 867 const user_manager::User* active_user) {
874 } 868 }
875 869
876 void SystemTrayDelegateChromeOS::ActiveUserChanged( 870 void SystemTrayDelegateChromeOS::ActiveUserChanged(
877 const user_manager::User* /* active_user */) { 871 const user_manager::User* /* active_user */) {
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
1340 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1334 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1341 << "ENABLE_SUPERVISED_USERS undefined."; 1335 << "ENABLE_SUPERVISED_USERS undefined.";
1342 return base::string16(); 1336 return base::string16();
1343 } 1337 }
1344 1338
1345 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1339 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1346 return new SystemTrayDelegateChromeOS(); 1340 return new SystemTrayDelegateChromeOS();
1347 } 1341 }
1348 1342
1349 } // namespace chromeos 1343 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698