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

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: Created 4 years, 4 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
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 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 void SystemTrayDelegateChromeOS::ShouldRebootOnShutdown( 839 void SystemTrayDelegateChromeOS::ShouldRebootOnShutdown(
841 const ash::RebootOnShutdownCallback& callback) { 840 const ash::RebootOnShutdownCallback& callback) {
842 shutdown_policy_handler_->CheckIfRebootOnShutdown(callback); 841 shutdown_policy_handler_->CheckIfRebootOnShutdown(callback);
843 } 842 }
844 843
845 ash::VPNDelegate* SystemTrayDelegateChromeOS::GetVPNDelegate() const { 844 ash::VPNDelegate* SystemTrayDelegateChromeOS::GetVPNDelegate() const {
846 return vpn_delegate_.get(); 845 return vpn_delegate_.get();
847 } 846 }
848 847
849 std::unique_ptr<ash::SystemTrayItem> 848 std::unique_ptr<ash::SystemTrayItem>
850 SystemTrayDelegateChromeOS::CreateDisplayTrayItem(ash::SystemTray* tray) {
851 return base::MakeUnique<ash::TrayDisplay>(tray);
852 }
853
854 std::unique_ptr<ash::SystemTrayItem>
855 SystemTrayDelegateChromeOS::CreateRotationLockTrayItem(ash::SystemTray* tray) { 849 SystemTrayDelegateChromeOS::CreateRotationLockTrayItem(ash::SystemTray* tray) {
856 return base::MakeUnique<ash::TrayRotationLock>(tray); 850 return base::MakeUnique<ash::TrayRotationLock>(tray);
857 } 851 }
858 852
859 void SystemTrayDelegateChromeOS::UserAddedToSession( 853 void SystemTrayDelegateChromeOS::UserAddedToSession(
860 const user_manager::User* active_user) { 854 const user_manager::User* active_user) {
861 } 855 }
862 856
863 void SystemTrayDelegateChromeOS::ActiveUserChanged( 857 void SystemTrayDelegateChromeOS::ActiveUserChanged(
864 const user_manager::User* /* active_user */) { 858 const user_manager::User* /* active_user */) {
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " 1321 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
1328 << "ENABLE_SUPERVISED_USERS undefined."; 1322 << "ENABLE_SUPERVISED_USERS undefined.";
1329 return base::string16(); 1323 return base::string16();
1330 } 1324 }
1331 1325
1332 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1326 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1333 return new SystemTrayDelegateChromeOS(); 1327 return new SystemTrayDelegateChromeOS();
1334 } 1328 }
1335 1329
1336 } // namespace chromeos 1330 } // namespace chromeos
OLDNEW
« ash/test/ash_test_base.cc ('K') | « 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