Remove retail mode.

chrome/browser/chromeos/login/lock/screen_locker.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 366 matching lines @@
   }
 }
 
 // static
 void ScreenLocker::Show() {
   content::RecordAction(UserMetricsAction("ScreenLocker_Show"));
   DCHECK(base::MessageLoopForUI::IsCurrent());
 
   // Check whether the currently logged in user is a guest account and if so,
   // refuse to lock the screen (crosbug.com/23764).
-  // For a demo user, we should never show the lock screen (crosbug.com/27647).
-  if (user_manager::UserManager::Get()->IsLoggedInAsGuest() ||
-      user_manager::UserManager::Get()->IsLoggedInAsDemoUser()) {
-    VLOG(1) << "Refusing to lock screen for guest/demo account";
+  if (user_manager::UserManager::Get()->IsLoggedInAsGuest()) {
+    VLOG(1) << "Refusing to lock screen for guest account";
     return;
   }
 
 #if !defined(USE_ATHENA)
   // If the active window is fullscreen, exit fullscreen to avoid the web page
   // or app mimicking the lock screen. Do not exit fullscreen if the shelf is
   // visible while in fullscreen because the shelf makes it harder for a web
   // page or app to mimick the lock screen.
   ash::wm::WindowState* active_window_state = ash::wm::GetActiveWindowState();
   if (active_window_state &&
@@ skipping 13 matching lines @@
     VLOG(1) << "ScreenLocker " << screen_locker_ << " already exists; "
             << " calling session manager's HandleLockScreenShown D-Bus method";
     DBusThreadManager::Get()->GetSessionManagerClient()->
         NotifyLockScreenShown();
   }
 }
 
 // static
 void ScreenLocker::Hide() {
   DCHECK(base::MessageLoopForUI::IsCurrent());
   // For a guest/demo user, screen_locker_ would have never been initialized.

[bartfab (slow), 2014/11/27 16:25:47]

Nit: s:/demo::

[rkc, 2014/12/01 19:15:04]

Done.

-  if (user_manager::UserManager::Get()->IsLoggedInAsGuest() ||
-      user_manager::UserManager::Get()->IsLoggedInAsDemoUser()) {
-    VLOG(1) << "Refusing to hide lock screen for guest/demo account";
+  if (user_manager::UserManager::Get()->IsLoggedInAsGuest()) {
+    VLOG(1) << "Refusing to hide lock screen for guest account";
     return;
   }
 
   DCHECK(screen_locker_);
   base::Callback<void(void)> callback =
       base::Bind(&ScreenLocker::ScheduleDeletion);
 #if !defined(USE_ATHENA)
   ash::Shell::GetInstance()->lock_state_controller()->
     OnLockScreenHide(callback);
 #else
@@ skipping 89 matching lines @@
   for (user_manager::UserList::const_iterator it = users_.begin();
        it != users_.end();
        ++it) {
     if ((*it)->email() == username)
       return true;
   }
   return false;
 }
 
 }  // namespace chromeos