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

Side by Side Diff: chrome/browser/ui/webui/signin/user_manager_screen_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/signin/user_manager_screen_handler.h" 5 #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/profiler/scoped_tracker.h" 13 #include "base/profiler/scoped_tracker.h"
15 #include "base/single_thread_task_runner.h" 14 #include "base/single_thread_task_runner.h"
16 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
17 #include "base/thread_task_runner_handle.h" 16 #include "base/thread_task_runner_handle.h"
18 #include "base/value_conversions.h" 17 #include "base/value_conversions.h"
19 #include "base/values.h" 18 #include "base/values.h"
20 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/chrome_notification_types.h" 20 #include "chrome/browser/chrome_notification_types.h"
22 #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_ap i.h" 21 #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_ap i.h"
23 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
(...skipping 12 matching lines...) Expand all
36 #include "chrome/browser/ui/browser_finder.h" 35 #include "chrome/browser/ui/browser_finder.h"
37 #include "chrome/browser/ui/browser_list.h" 36 #include "chrome/browser/ui/browser_list.h"
38 #include "chrome/browser/ui/browser_list_observer.h" 37 #include "chrome/browser/ui/browser_list_observer.h"
39 #include "chrome/browser/ui/chrome_pages.h" 38 #include "chrome/browser/ui/chrome_pages.h"
40 #include "chrome/browser/ui/singleton_tabs.h" 39 #include "chrome/browser/ui/singleton_tabs.h"
41 #include "chrome/browser/ui/user_manager.h" 40 #include "chrome/browser/ui/user_manager.h"
42 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
43 #include "chrome/common/url_constants.h" 42 #include "chrome/common/url_constants.h"
44 #include "chrome/grit/chromium_strings.h" 43 #include "chrome/grit/chromium_strings.h"
45 #include "chrome/grit/generated_resources.h" 44 #include "chrome/grit/generated_resources.h"
45 #include "components/prefs/pref_service.h"
46 #include "components/proximity_auth/screenlock_bridge.h" 46 #include "components/proximity_auth/screenlock_bridge.h"
47 #include "components/signin/core/account_id/account_id.h" 47 #include "components/signin/core/account_id/account_id.h"
48 #include "content/public/browser/notification_service.h" 48 #include "content/public/browser/notification_service.h"
49 #include "content/public/browser/web_contents.h" 49 #include "content/public/browser/web_contents.h"
50 #include "content/public/browser/web_ui.h" 50 #include "content/public/browser/web_ui.h"
51 #include "google_apis/gaia/gaia_auth_fetcher.h" 51 #include "google_apis/gaia/gaia_auth_fetcher.h"
52 #include "google_apis/gaia/gaia_constants.h" 52 #include "google_apis/gaia/gaia_constants.h"
53 #include "grit/components_strings.h" 53 #include "grit/components_strings.h"
54 #include "third_party/skia/include/core/SkBitmap.h" 54 #include "third_party/skia/include/core/SkBitmap.h"
55 #include "ui/base/l10n/l10n_util.h" 55 #include "ui/base/l10n/l10n_util.h"
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 Profile* profile, Profile::CreateStatus profile_create_status) { 1016 Profile* profile, Profile::CreateStatus profile_create_status) {
1017 Browser* browser = chrome::FindAnyBrowser(profile, false, desktop_type_); 1017 Browser* browser = chrome::FindAnyBrowser(profile, false, desktop_type_);
1018 if (browser && browser->window()) { 1018 if (browser && browser->window()) {
1019 OnBrowserWindowReady(browser); 1019 OnBrowserWindowReady(browser);
1020 } else { 1020 } else {
1021 registrar_.Add(this, 1021 registrar_.Add(this,
1022 chrome::NOTIFICATION_BROWSER_WINDOW_READY, 1022 chrome::NOTIFICATION_BROWSER_WINDOW_READY,
1023 content::NotificationService::AllSources()); 1023 content::NotificationService::AllSources());
1024 } 1024 }
1025 } 1025 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698