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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/webui/options/sync_setup_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
« no previous file with comments | « chrome/browser/ui/webui/options/supervised_user_import_handler.cc ('k') | chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc » ('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 #include "chrome/browser/ui/webui/options/sync_setup_handler.h" 5 #include "chrome/browser/ui/webui/options/sync_setup_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/i18n/time_formatting.h" 13 #include "base/i18n/time_formatting.h"
14 #include "base/json/json_reader.h" 14 #include "base/json/json_reader.h"
15 #include "base/json/json_writer.h" 15 #include "base/json/json_writer.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "base/metrics/histogram.h" 17 #include "base/metrics/histogram.h"
18 #include "base/prefs/pref_service.h"
19 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
20 #include "base/values.h" 19 #include "base/values.h"
21 #include "build/build_config.h" 20 #include "build/build_config.h"
22 #include "chrome/app/chrome_command_ids.h" 21 #include "chrome/app/chrome_command_ids.h"
23 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/lifetime/application_lifetime.h" 23 #include "chrome/browser/lifetime/application_lifetime.h"
25 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/browser/profiles/profile_info_cache.h" 25 #include "chrome/browser/profiles/profile_info_cache.h"
27 #include "chrome/browser/profiles/profile_metrics.h" 26 #include "chrome/browser/profiles/profile_metrics.h"
28 #include "chrome/browser/signin/chrome_signin_helper.h" 27 #include "chrome/browser/signin/chrome_signin_helper.h"
29 #include "chrome/browser/signin/signin_error_controller_factory.h" 28 #include "chrome/browser/signin/signin_error_controller_factory.h"
30 #include "chrome/browser/signin/signin_manager_factory.h" 29 #include "chrome/browser/signin/signin_manager_factory.h"
31 #include "chrome/browser/signin/signin_promo.h" 30 #include "chrome/browser/signin/signin_promo.h"
32 #include "chrome/browser/sync/profile_sync_service_factory.h" 31 #include "chrome/browser/sync/profile_sync_service_factory.h"
33 #include "chrome/browser/ui/browser_finder.h" 32 #include "chrome/browser/ui/browser_finder.h"
34 #include "chrome/browser/ui/browser_window.h" 33 #include "chrome/browser/ui/browser_window.h"
35 #include "chrome/browser/ui/singleton_tabs.h" 34 #include "chrome/browser/ui/singleton_tabs.h"
36 #include "chrome/browser/ui/webui/options/options_handlers_helper.h" 35 #include "chrome/browser/ui/webui/options/options_handlers_helper.h"
37 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 36 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
38 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 37 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
39 #include "chrome/common/chrome_switches.h" 38 #include "chrome/common/chrome_switches.h"
40 #include "chrome/common/url_constants.h" 39 #include "chrome/common/url_constants.h"
41 #include "chrome/grit/chromium_strings.h" 40 #include "chrome/grit/chromium_strings.h"
42 #include "chrome/grit/generated_resources.h" 41 #include "chrome/grit/generated_resources.h"
43 #include "chrome/grit/locale_settings.h" 42 #include "chrome/grit/locale_settings.h"
44 #include "components/autofill/core/common/autofill_constants.h" 43 #include "components/autofill/core/common/autofill_constants.h"
45 #include "components/autofill/core/common/autofill_pref_names.h" 44 #include "components/autofill/core/common/autofill_pref_names.h"
46 #include "components/browser_sync/browser/profile_sync_service.h" 45 #include "components/browser_sync/browser/profile_sync_service.h"
47 #include "components/google/core/browser/google_util.h" 46 #include "components/google/core/browser/google_util.h"
47 #include "components/prefs/pref_service.h"
48 #include "components/signin/core/browser/signin_error_controller.h" 48 #include "components/signin/core/browser/signin_error_controller.h"
49 #include "components/signin/core/browser/signin_header_helper.h" 49 #include "components/signin/core/browser/signin_header_helper.h"
50 #include "components/signin/core/browser/signin_metrics.h" 50 #include "components/signin/core/browser/signin_metrics.h"
51 #include "components/signin/core/common/profile_management_switches.h" 51 #include "components/signin/core/common/profile_management_switches.h"
52 #include "components/sync_driver/sync_prefs.h" 52 #include "components/sync_driver/sync_prefs.h"
53 #include "content/public/browser/render_view_host.h" 53 #include "content/public/browser/render_view_host.h"
54 #include "content/public/browser/web_contents.h" 54 #include "content/public/browser/web_contents.h"
55 #include "content/public/browser/web_contents_delegate.h" 55 #include "content/public/browser/web_contents_delegate.h"
56 #include "google_apis/gaia/gaia_auth_util.h" 56 #include "google_apis/gaia/gaia_auth_util.h"
57 #include "google_apis/gaia/gaia_constants.h" 57 #include "google_apis/gaia/gaia_constants.h"
(...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after
962 "SyncSetupOverlay.showSyncSetupPage", page, args); 962 "SyncSetupOverlay.showSyncSetupPage", page, args);
963 963
964 // Make sure the tab used for the Gaia sign in does not cover the settings 964 // Make sure the tab used for the Gaia sign in does not cover the settings
965 // tab. 965 // tab.
966 FocusUI(); 966 FocusUI();
967 } 967 }
968 968
969 LoginUIService* SyncSetupHandler::GetLoginUIService() const { 969 LoginUIService* SyncSetupHandler::GetLoginUIService() const {
970 return LoginUIServiceFactory::GetForProfile(GetProfile()); 970 return LoginUIServiceFactory::GetForProfile(GetProfile());
971 } 971 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/supervised_user_import_handler.cc ('k') | chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698