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

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

Issue 149233004: Revert "Automatically trigger installation of high-quality speech synthesis extension." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Don't remove WillSpeakUtteranceWithVoice, it is dependent upon by a test now. Created 6 years, 10 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 | « no previous file | chrome/browser/extensions/component_loader.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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" 26 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
27 #include "chrome/browser/chromeos/settings/cros_settings.h" 27 #include "chrome/browser/chromeos/settings/cros_settings.h"
28 #include "chrome/browser/chromeos/settings/device_settings_service.h" 28 #include "chrome/browser/chromeos/settings/device_settings_service.h"
29 #include "chromeos/dbus/session_manager_client.h" 29 #include "chromeos/dbus/session_manager_client.h"
30 #include "content/public/browser/notification_observer.h" 30 #include "content/public/browser/notification_observer.h"
31 #include "content/public/browser/notification_registrar.h" 31 #include "content/public/browser/notification_registrar.h"
32 32
33 class PrefService; 33 class PrefService;
34 class ProfileSyncService; 34 class ProfileSyncService;
35 35
36 namespace extensions {
37 class ExternalComponentLoaderTest;
38 }
39
40 namespace policy { 36 namespace policy {
41 struct DeviceLocalAccount; 37 struct DeviceLocalAccount;
42 } 38 }
43 39
44 namespace chromeos { 40 namespace chromeos {
45 41
46 class MultiProfileFirstRunNotification; 42 class MultiProfileFirstRunNotification;
47 class MultiProfileUserController; 43 class MultiProfileUserController;
48 class RemoveUserDelegate; 44 class RemoveUserDelegate;
49 class SupervisedUserManagerImpl; 45 class SupervisedUserManagerImpl;
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 virtual void OnDeviceLocalAccountsChanged() OVERRIDE; 160 virtual void OnDeviceLocalAccountsChanged() OVERRIDE;
165 161
166 virtual bool RespectLocalePreference( 162 virtual bool RespectLocalePreference(
167 Profile* profile, 163 Profile* profile,
168 const User* user, 164 const User* user,
169 scoped_ptr<locale_util::SwitchLanguageCallback> callback) const OVERRIDE; 165 scoped_ptr<locale_util::SwitchLanguageCallback> callback) const OVERRIDE;
170 166
171 void StopPolicyObserverForTesting(); 167 void StopPolicyObserverForTesting();
172 168
173 private: 169 private:
174 friend class extensions::ExternalComponentLoaderTest;
175 friend class SupervisedUserManagerImpl; 170 friend class SupervisedUserManagerImpl;
176 friend class UserManager; 171 friend class UserManager;
177 friend class WallpaperManager; 172 friend class WallpaperManager;
178 friend class UserManagerTest; 173 friend class UserManagerTest;
179 friend class WallpaperManagerTest; 174 friend class WallpaperManagerTest;
180 175
181 typedef base::hash_map<std::string, 176 typedef base::hash_map<std::string,
182 linked_ptr<UserImageManager> > UserImageManagerMap; 177 linked_ptr<UserImageManager> > UserImageManagerMap;
183 178
184 // Stages of loading user list from preferences. Some methods can have 179 // Stages of loading user list from preferences. Some methods can have
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 473
479 // Observer for the policy that can be used to manage user images. 474 // Observer for the policy that can be used to manage user images.
480 scoped_ptr<policy::CloudExternalDataPolicyObserver> policy_observer_; 475 scoped_ptr<policy::CloudExternalDataPolicyObserver> policy_observer_;
481 476
482 DISALLOW_COPY_AND_ASSIGN(UserManagerImpl); 477 DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
483 }; 478 };
484 479
485 } // namespace chromeos 480 } // namespace chromeos
486 481
487 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_ 482 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/component_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698