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

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

Issue 2412863005: Make some code gender neutral. (Closed)
Patch Set: Created 4 years, 2 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/chrome_screenshot_grabber.cc ('k') | chrome/browser/ui/user_manager.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/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 10
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 size_t admitted_users_to_be_added = 351 size_t admitted_users_to_be_added =
352 user_manager::UserManager::Get()->GetUsersAllowedForMultiProfile().size(); 352 user_manager::UserManager::Get()->GetUsersAllowedForMultiProfile().size();
353 size_t logged_in_users = 353 size_t logged_in_users =
354 user_manager::UserManager::Get()->GetLoggedInUsers().size(); 354 user_manager::UserManager::Get()->GetLoggedInUsers().size();
355 if (!logged_in_users) { 355 if (!logged_in_users) {
356 // The shelf gets created on the login screen and as such we have to create 356 // The shelf gets created on the login screen and as such we have to create
357 // all multi profile items of the the system tray menu before the user logs 357 // all multi profile items of the the system tray menu before the user logs
358 // in. For special cases like Kiosk mode and / or guest mode this isn't a 358 // in. For special cases like Kiosk mode and / or guest mode this isn't a
359 // problem since either the browser gets restarted and / or the flag is not 359 // problem since either the browser gets restarted and / or the flag is not
360 // allowed, but for an "ephermal" user (see crbug.com/312324) it is not 360 // allowed, but for an "ephermal" user (see crbug.com/312324) it is not
361 // decided yet if he could add other users to his session or not. 361 // decided yet if they could add other users to their session or not.
362 // TODO(skuhne): As soon as the issue above needs to be resolved, this logic 362 // TODO(skuhne): As soon as the issue above needs to be resolved, this logic
363 // should change. 363 // should change.
364 logged_in_users = 1; 364 logged_in_users = 1;
365 } 365 }
366 return admitted_users_to_be_added + logged_in_users > 1; 366 return admitted_users_to_be_added + logged_in_users > 1;
367 } 367 }
368 368
369 bool ChromeShellDelegate::IsIncognitoAllowed() const { 369 bool ChromeShellDelegate::IsIncognitoAllowed() const {
370 return AccessibilityManager::Get()->IsIncognitoAllowed(); 370 return AccessibilityManager::Get()->IsIncognitoAllowed();
371 } 371 }
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 NOTREACHED() << "Unexpected notification " << type; 555 NOTREACHED() << "Unexpected notification " << type;
556 } 556 }
557 } 557 }
558 558
559 void ChromeShellDelegate::PlatformInit() { 559 void ChromeShellDelegate::PlatformInit() {
560 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 560 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
561 content::NotificationService::AllSources()); 561 content::NotificationService::AllSources());
562 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, 562 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
563 content::NotificationService::AllSources()); 563 content::NotificationService::AllSources());
564 } 564 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_screenshot_grabber.cc ('k') | chrome/browser/ui/user_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698