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

Side by Side Diff: chrome/browser/chromeos/login/user_manager_impl.cc

Issue 14427002: Move InputMethodManager from c/b/chromeos to chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing old header Created 7 years, 8 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
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/chromeos/login/user_manager_impl.h" 5 #include "chrome/browser/chromeos/login/user_manager_impl.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/chromeos/chromeos_version.h" 13 #include "base/chromeos/chromeos_version.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/file_util.h" 16 #include "base/file_util.h"
17 #include "base/files/file_path.h" 17 #include "base/files/file_path.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/prefs/pref_registry_simple.h" 19 #include "base/prefs/pref_registry_simple.h"
20 #include "base/prefs/pref_service.h" 20 #include "base/prefs/pref_service.h"
21 #include "base/rand_util.h" 21 #include "base/rand_util.h"
22 #include "base/string_util.h" 22 #include "base/string_util.h"
23 #include "base/stringprintf.h" 23 #include "base/stringprintf.h"
24 #include "base/utf_string_conversions.h" 24 #include "base/utf_string_conversions.h"
25 #include "base/values.h" 25 #include "base/values.h"
26 #include "chrome/browser/app_mode/app_mode_utils.h" 26 #include "chrome/browser/app_mode/app_mode_utils.h"
27 #include "chrome/browser/browser_process.h" 27 #include "chrome/browser/browser_process.h"
28 #include "chrome/browser/chromeos/cros/cert_library.h" 28 #include "chrome/browser/chromeos/cros/cert_library.h"
29 #include "chrome/browser/chromeos/cros/cros_library.h" 29 #include "chrome/browser/chromeos/cros/cros_library.h"
30 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
31 #include "chrome/browser/chromeos/login/login_display.h" 30 #include "chrome/browser/chromeos/login/login_display.h"
32 #include "chrome/browser/chromeos/login/remove_user_delegate.h" 31 #include "chrome/browser/chromeos/login/remove_user_delegate.h"
33 #include "chrome/browser/chromeos/login/user_image_manager_impl.h" 32 #include "chrome/browser/chromeos/login/user_image_manager_impl.h"
34 #include "chrome/browser/chromeos/login/wizard_controller.h" 33 #include "chrome/browser/chromeos/login/wizard_controller.h"
35 #include "chrome/browser/chromeos/session_length_limiter.h" 34 #include "chrome/browser/chromeos/session_length_limiter.h"
36 #include "chrome/browser/policy/browser_policy_connector.h" 35 #include "chrome/browser/policy/browser_policy_connector.h"
37 #include "chrome/browser/prefs/scoped_user_pref_update.h" 36 #include "chrome/browser/prefs/scoped_user_pref_update.h"
38 #include "chrome/browser/profiles/profile_manager.h" 37 #include "chrome/browser/profiles/profile_manager.h"
39 #include "chrome/browser/sync/profile_sync_service.h" 38 #include "chrome/browser/sync/profile_sync_service.h"
40 #include "chrome/browser/sync/profile_sync_service_factory.h" 39 #include "chrome/browser/sync/profile_sync_service_factory.h"
41 #include "chrome/common/chrome_notification_types.h" 40 #include "chrome/common/chrome_notification_types.h"
42 #include "chrome/common/chrome_switches.h" 41 #include "chrome/common/chrome_switches.h"
43 #include "chrome/common/pref_names.h" 42 #include "chrome/common/pref_names.h"
44 #include "chromeos/chromeos_switches.h" 43 #include "chromeos/chromeos_switches.h"
45 #include "chromeos/cryptohome/async_method_caller.h" 44 #include "chromeos/cryptohome/async_method_caller.h"
45 #include "chromeos/ime/input_method_manager.h"
46 #include "chromeos/login/login_state.h" 46 #include "chromeos/login/login_state.h"
47 #include "content/public/browser/browser_thread.h" 47 #include "content/public/browser/browser_thread.h"
48 #include "content/public/browser/notification_service.h" 48 #include "content/public/browser/notification_service.h"
49 #include "google_apis/gaia/gaia_auth_util.h" 49 #include "google_apis/gaia/gaia_auth_util.h"
50 #include "google_apis/gaia/google_service_auth_error.h" 50 #include "google_apis/gaia/google_service_auth_error.h"
51 #include "policy/policy_constants.h" 51 #include "policy/policy_constants.h"
52 52
53 using content::BrowserThread; 53 using content::BrowserThread;
54 54
55 namespace chromeos { 55 namespace chromeos {
(...skipping 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after
1420 login_user_type = LoginState::LOGGED_IN_USER_LOCALLY_MANAGED; 1420 login_user_type = LoginState::LOGGED_IN_USER_LOCALLY_MANAGED;
1421 else if (active_user_->GetType() == User::USER_TYPE_KIOSK_APP) 1421 else if (active_user_->GetType() == User::USER_TYPE_KIOSK_APP)
1422 login_user_type = LoginState::LOGGED_IN_USER_KIOSK_APP; 1422 login_user_type = LoginState::LOGGED_IN_USER_KIOSK_APP;
1423 else 1423 else
1424 login_user_type = LoginState::LOGGED_IN_USER_REGULAR; 1424 login_user_type = LoginState::LOGGED_IN_USER_REGULAR;
1425 1425
1426 LoginState::Get()->SetLoggedInState(logged_in_state, login_user_type); 1426 LoginState::Get()->SetLoggedInState(logged_in_state, login_user_type);
1427 } 1427 }
1428 1428
1429 } // namespace chromeos 1429 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/browser/chromeos/login/webui_login_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698