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

Side by Side Diff: chrome/browser/chromeos/login/session/user_session_manager.cc

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add ui/chromeos/ime/DEPS Created 6 years, 1 month 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/session/user_session_manager.h" 5 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 #include "chrome/browser/signin/signin_manager_factory.h" 62 #include "chrome/browser/signin/signin_manager_factory.h"
63 #include "chrome/common/chrome_switches.h" 63 #include "chrome/common/chrome_switches.h"
64 #include "chrome/common/logging_chrome.h" 64 #include "chrome/common/logging_chrome.h"
65 #include "chrome/common/pref_names.h" 65 #include "chrome/common/pref_names.h"
66 #include "chromeos/cert_loader.h" 66 #include "chromeos/cert_loader.h"
67 #include "chromeos/chromeos_switches.h" 67 #include "chromeos/chromeos_switches.h"
68 #include "chromeos/cryptohome/cryptohome_util.h" 68 #include "chromeos/cryptohome/cryptohome_util.h"
69 #include "chromeos/dbus/cryptohome_client.h" 69 #include "chromeos/dbus/cryptohome_client.h"
70 #include "chromeos/dbus/dbus_thread_manager.h" 70 #include "chromeos/dbus/dbus_thread_manager.h"
71 #include "chromeos/dbus/session_manager_client.h" 71 #include "chromeos/dbus/session_manager_client.h"
72 #include "chromeos/ime/input_method_manager.h"
73 #include "chromeos/login/user_names.h" 72 #include "chromeos/login/user_names.h"
74 #include "chromeos/network/portal_detector/network_portal_detector.h" 73 #include "chromeos/network/portal_detector/network_portal_detector.h"
75 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" 74 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"
76 #include "chromeos/settings/cros_settings_names.h" 75 #include "chromeos/settings/cros_settings_names.h"
77 #include "components/component_updater/component_updater_service.h" 76 #include "components/component_updater/component_updater_service.h"
78 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 77 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
79 #include "components/session_manager/core/session_manager.h" 78 #include "components/session_manager/core/session_manager.h"
80 #include "components/signin/core/browser/account_tracker_service.h" 79 #include "components/signin/core/browser/account_tracker_service.h"
81 #include "components/signin/core/browser/signin_manager_base.h" 80 #include "components/signin/core/browser/signin_manager_base.h"
82 #include "components/user_manager/user.h" 81 #include "components/user_manager/user.h"
83 #include "components/user_manager/user_manager.h" 82 #include "components/user_manager/user_manager.h"
84 #include "components/user_manager/user_type.h" 83 #include "components/user_manager/user_type.h"
85 #include "content/public/browser/browser_thread.h" 84 #include "content/public/browser/browser_thread.h"
86 #include "content/public/browser/notification_service.h" 85 #include "content/public/browser/notification_service.h"
86 #include "ui/chromeos/ime/input_method_manager.h"
87 #include "url/gurl.h" 87 #include "url/gurl.h"
88 88
89 namespace chromeos { 89 namespace chromeos {
90 90
91 namespace { 91 namespace {
92 92
93 // ChromeVox tutorial URL (used in place of "getting started" url when 93 // ChromeVox tutorial URL (used in place of "getting started" url when
94 // accessibility is enabled). 94 // accessibility is enabled).
95 const char kChromeVoxTutorialURLPattern[] = 95 const char kChromeVoxTutorialURLPattern[] =
96 "http://www.chromevox.com/tutorial/index.html?lang=%s"; 96 "http://www.chromevox.com/tutorial/index.html?lang=%s";
(...skipping 1293 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 } 1390 }
1391 1391
1392 EasyUnlockKeyManager* UserSessionManager::GetEasyUnlockKeyManager() { 1392 EasyUnlockKeyManager* UserSessionManager::GetEasyUnlockKeyManager() {
1393 if (!easy_unlock_key_manager_) 1393 if (!easy_unlock_key_manager_)
1394 easy_unlock_key_manager_.reset(new EasyUnlockKeyManager); 1394 easy_unlock_key_manager_.reset(new EasyUnlockKeyManager);
1395 1395
1396 return easy_unlock_key_manager_.get(); 1396 return easy_unlock_key_manager_.get();
1397 } 1397 }
1398 1398
1399 } // namespace chromeos 1399 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698