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

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

Issue 575653002: Revert of ash: Add checks for supervised users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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_linux.cc ('k') | components/user_manager/user.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/ui/ash/system_tray_delegate_win.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_win.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 } 76 }
77 77
78 virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE { 78 virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE {
79 return base::string16(); 79 return base::string16();
80 } 80 }
81 81
82 virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE { 82 virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE {
83 return base::string16(); 83 return base::string16();
84 } 84 }
85 85
86 virtual bool IsUserSupervised() const OVERRIDE {
87 return false;
88 }
89
90 virtual bool SystemShouldUpgrade() const OVERRIDE { 86 virtual bool SystemShouldUpgrade() const OVERRIDE {
91 return UpgradeDetector::GetInstance()->notify_upgrade(); 87 return UpgradeDetector::GetInstance()->notify_upgrade();
92 } 88 }
93 89
94 virtual base::HourClockType GetHourClockType() const OVERRIDE { 90 virtual base::HourClockType GetHourClockType() const OVERRIDE {
95 return clock_type_; 91 return clock_type_;
96 } 92 }
97 93
98 virtual void ShowSettings() OVERRIDE { 94 virtual void ShowSettings() OVERRIDE {
99 } 95 }
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 328
333 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin); 329 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateWin);
334 }; 330 };
335 331
336 } // namespace 332 } // namespace
337 333
338 334
339 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() { 335 ash::SystemTrayDelegate* CreateWindowsSystemTrayDelegate() {
340 return new SystemTrayDelegateWin(); 336 return new SystemTrayDelegateWin();
341 } 337 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_linux.cc ('k') | components/user_manager/user.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698