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

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

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
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 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 ash::CustodianInfoTrayObserver* observer) override; 147 ash::CustodianInfoTrayObserver* observer) override;
148 void RemoveCustodianInfoTrayObserver( 148 void RemoveCustodianInfoTrayObserver(
149 ash::CustodianInfoTrayObserver* observer) override; 149 ash::CustodianInfoTrayObserver* observer) override;
150 void AddShutdownPolicyObserver( 150 void AddShutdownPolicyObserver(
151 ash::ShutdownPolicyObserver* observer) override; 151 ash::ShutdownPolicyObserver* observer) override;
152 void RemoveShutdownPolicyObserver( 152 void RemoveShutdownPolicyObserver(
153 ash::ShutdownPolicyObserver* observer) override; 153 ash::ShutdownPolicyObserver* observer) override;
154 void ShouldRebootOnShutdown( 154 void ShouldRebootOnShutdown(
155 const ash::RebootOnShutdownCallback& callback) override; 155 const ash::RebootOnShutdownCallback& callback) override;
156 ash::VPNDelegate* GetVPNDelegate() const override; 156 ash::VPNDelegate* GetVPNDelegate() const override;
157 std::unique_ptr<ash::SystemTrayItem> CreateDisplayTrayItem(
158 ash::SystemTray* tray) override;
159 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem( 157 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem(
160 ash::SystemTray* tray) override; 158 ash::SystemTray* tray) override;
161 159
162 // Overridden from user_manager::UserManager::UserSessionStateObserver: 160 // Overridden from user_manager::UserManager::UserSessionStateObserver:
163 void UserAddedToSession(const user_manager::User* active_user) override; 161 void UserAddedToSession(const user_manager::User* active_user) override;
164 void ActiveUserChanged(const user_manager::User* active_user) override; 162 void ActiveUserChanged(const user_manager::User* active_user) override;
165 163
166 void UserChangedChildStatus(user_manager::User* user) override; 164 void UserChangedChildStatus(user_manager::User* user) override;
167 165
168 // browser tests need to call ShouldUse24HourClock(). 166 // browser tests need to call ShouldUse24HourClock().
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 318
321 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 319 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
322 320
323 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 321 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
324 }; 322 };
325 323
326 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 324 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
327 325
328 } // namespace chromeos 326 } // namespace chromeos
329 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 327 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/test/test_system_tray_delegate.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698