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

Side by Side Diff: chrome/browser/ui/webui/options/supervised_user_import_handler.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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/ui/webui/options/supervised_user_import_handler.h" 5 #include "chrome/browser/ui/webui/options/supervised_user_import_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/values.h" 13 #include "base/values.h"
15 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/profiles/profile_avatar_icon_util.h" 16 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
18 #include "chrome/browser/profiles/profile_info_cache.h" 17 #include "chrome/browser/profiles/profile_info_cache.h"
19 #include "chrome/browser/profiles/profile_manager.h" 18 #include "chrome/browser/profiles/profile_manager.h"
20 #include "chrome/browser/signin/signin_error_controller_factory.h" 19 #include "chrome/browser/signin/signin_error_controller_factory.h"
21 #include "chrome/browser/signin/signin_manager_factory.h" 20 #include "chrome/browser/signin/signin_manager_factory.h"
22 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h" 21 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h"
23 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service_factory.h" 22 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service_factory.h"
24 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" 23 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
25 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_fac tory.h" 24 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_fac tory.h"
26 #include "chrome/browser/supervised_user/supervised_user_constants.h" 25 #include "chrome/browser/supervised_user/supervised_user_constants.h"
27 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
28 #include "chrome/grit/generated_resources.h" 27 #include "chrome/grit/generated_resources.h"
28 #include "components/prefs/pref_service.h"
29 #include "components/signin/core/browser/signin_error_controller.h" 29 #include "components/signin/core/browser/signin_error_controller.h"
30 #include "components/signin/core/browser/signin_manager.h" 30 #include "components/signin/core/browser/signin_manager.h"
31 #include "content/public/browser/web_ui.h" 31 #include "content/public/browser/web_ui.h"
32 #include "grit/theme_resources.h" 32 #include "grit/theme_resources.h"
33 33
34 namespace { 34 namespace {
35 35
36 scoped_ptr<base::ListValue> GetAvatarIcons() { 36 scoped_ptr<base::ListValue> GetAvatarIcons() {
37 scoped_ptr<base::ListValue> avatar_icons(new base::ListValue); 37 scoped_ptr<base::ListValue> avatar_icons(new base::ListValue);
38 for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount(); ++i) { 38 for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount(); ++i) {
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 const std::string& key) { 292 const std::string& key) {
293 if (key == supervised_users::kChromeAvatarIndex) 293 if (key == supervised_users::kChromeAvatarIndex)
294 FetchSupervisedUsers(); 294 FetchSupervisedUsers();
295 } 295 }
296 296
297 void SupervisedUserImportHandler::OnErrorChanged() { 297 void SupervisedUserImportHandler::OnErrorChanged() {
298 FetchSupervisedUsers(); 298 FetchSupervisedUsers();
299 } 299 }
300 300
301 } // namespace options 301 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/startup_pages_handler.cc ('k') | chrome/browser/ui/webui/options/sync_setup_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698