| OLD | NEW |
| 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" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "chrome/browser/ui/browser_finder.h" | 31 #include "chrome/browser/ui/browser_finder.h" |
| 32 #include "chrome/browser/ui/browser_window.h" | 32 #include "chrome/browser/ui/browser_window.h" |
| 33 #include "chrome/browser/ui/singleton_tabs.h" | 33 #include "chrome/browser/ui/singleton_tabs.h" |
| 34 #include "chrome/browser/ui/webui/profile_helper.h" | 34 #include "chrome/browser/ui/webui/profile_helper.h" |
| 35 #include "chrome/browser/ui/webui/signin/login_ui_service.h" | 35 #include "chrome/browser/ui/webui/signin/login_ui_service.h" |
| 36 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" | 36 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" |
| 37 #include "chrome/common/chrome_switches.h" | 37 #include "chrome/common/chrome_switches.h" |
| 38 #include "chrome/common/url_constants.h" | 38 #include "chrome/common/url_constants.h" |
| 39 #include "chrome/grit/chromium_strings.h" | 39 #include "chrome/grit/chromium_strings.h" |
| 40 #include "chrome/grit/generated_resources.h" | 40 #include "chrome/grit/generated_resources.h" |
| 41 #include "chrome/grit/locale_settings.h" | |
| 42 #include "components/autofill/core/common/autofill_constants.h" | 41 #include "components/autofill/core/common/autofill_constants.h" |
| 43 #include "components/autofill/core/common/autofill_pref_names.h" | 42 #include "components/autofill/core/common/autofill_pref_names.h" |
| 44 #include "components/browser_sync/profile_sync_service.h" | 43 #include "components/browser_sync/profile_sync_service.h" |
| 45 #include "components/google/core/browser/google_util.h" | 44 #include "components/google/core/browser/google_util.h" |
| 46 #include "components/prefs/pref_service.h" | 45 #include "components/prefs/pref_service.h" |
| 47 #include "components/signin/core/browser/signin_error_controller.h" | 46 #include "components/signin/core/browser/signin_error_controller.h" |
| 48 #include "components/signin/core/browser/signin_header_helper.h" | 47 #include "components/signin/core/browser/signin_header_helper.h" |
| 49 #include "components/signin/core/browser/signin_metrics.h" | 48 #include "components/signin/core/browser/signin_metrics.h" |
| 50 #include "components/signin/core/common/profile_management_switches.h" | 49 #include "components/signin/core/common/profile_management_switches.h" |
| 51 #include "components/strings/grit/components_strings.h" | 50 #include "components/strings/grit/components_strings.h" |
| (...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 947 page, args); | 946 page, args); |
| 948 | 947 |
| 949 // Make sure the tab used for the Gaia sign in does not cover the settings | 948 // Make sure the tab used for the Gaia sign in does not cover the settings |
| 950 // tab. | 949 // tab. |
| 951 FocusUI(); | 950 FocusUI(); |
| 952 } | 951 } |
| 953 | 952 |
| 954 LoginUIService* SyncSetupHandler::GetLoginUIService() const { | 953 LoginUIService* SyncSetupHandler::GetLoginUIService() const { |
| 955 return LoginUIServiceFactory::GetForProfile(GetProfile()); | 954 return LoginUIServiceFactory::GetForProfile(GetProfile()); |
| 956 } | 955 } |
| OLD | NEW |