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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 15974008: Rename SessionStateController -> LockStateController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | no next file » | 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "google_apis/gaia/gaia_auth_util.h" 50 #include "google_apis/gaia/gaia_auth_util.h"
51 #include "google_apis/gaia/gaia_switches.h" 51 #include "google_apis/gaia/gaia_switches.h"
52 #include "google_apis/gaia/gaia_urls.h" 52 #include "google_apis/gaia/gaia_urls.h"
53 #include "grit/chromium_strings.h" 53 #include "grit/chromium_strings.h"
54 #include "grit/generated_resources.h" 54 #include "grit/generated_resources.h"
55 #include "third_party/cros_system_api/dbus/service_constants.h" 55 #include "third_party/cros_system_api/dbus/service_constants.h"
56 #include "ui/base/l10n/l10n_util.h" 56 #include "ui/base/l10n/l10n_util.h"
57 57
58 #if defined(USE_AURA) 58 #if defined(USE_AURA)
59 #include "ash/shell.h" 59 #include "ash/shell.h"
60 #include "ash/wm/session_state_controller.h" 60 #include "ash/wm/lock_state_controller.h"
61 #endif 61 #endif
62 62
63 using content::BrowserThread; 63 using content::BrowserThread;
64 using content::RenderViewHost; 64 using content::RenderViewHost;
65 65
66 namespace { 66 namespace {
67 67
68 // User dictionary keys. 68 // User dictionary keys.
69 const char kKeyUsername[] = "username"; 69 const char kKeyUsername[] = "username";
70 const char kKeyDisplayName[] = "displayName"; 70 const char kKeyDisplayName[] = "displayName";
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after
1145 } 1145 }
1146 if (!args->GetString(0, &email_)) 1146 if (!args->GetString(0, &email_))
1147 email_.clear(); 1147 email_.clear();
1148 // Load auth extension. Parameters are: force reload, do not load extension in 1148 // Load auth extension. Parameters are: force reload, do not load extension in
1149 // background, use offline version. 1149 // background, use offline version.
1150 LoadAuthExtension(true, false, true); 1150 LoadAuthExtension(true, false, true);
1151 UpdateUIState(UI_STATE_GAIA_SIGNIN, NULL); 1151 UpdateUIState(UI_STATE_GAIA_SIGNIN, NULL);
1152 } 1152 }
1153 1153
1154 void SigninScreenHandler::HandleShutdownSystem() { 1154 void SigninScreenHandler::HandleShutdownSystem() {
1155 ash::Shell::GetInstance()->session_state_controller()->RequestShutdown(); 1155 ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown();
1156 } 1156 }
1157 1157
1158 void SigninScreenHandler::HandleLoadWallpaper(const std::string& email) { 1158 void SigninScreenHandler::HandleLoadWallpaper(const std::string& email) {
1159 if (delegate_) 1159 if (delegate_)
1160 delegate_->LoadWallpaper(email); 1160 delegate_->LoadWallpaper(email);
1161 } 1161 }
1162 1162
1163 void SigninScreenHandler::HandleRebootSystem() { 1163 void SigninScreenHandler::HandleRebootSystem() {
1164 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart(); 1164 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart();
1165 } 1165 }
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
1611 if (!cros_settings) 1611 if (!cros_settings)
1612 return false; 1612 return false;
1613 1613
1614 // Offline login is allowed only when user pods are hidden. 1614 // Offline login is allowed only when user pods are hidden.
1615 bool show_pods; 1615 bool show_pods;
1616 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods); 1616 cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn, &show_pods);
1617 return !show_pods; 1617 return !show_pods;
1618 } 1618 }
1619 1619
1620 } // namespace chromeos 1620 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698