| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 #include "google_apis/gaia/gaia_constants.h" | 57 #include "google_apis/gaia/gaia_constants.h" |
| 58 #include "net/base/url_util.h" | 58 #include "net/base/url_util.h" |
| 59 #include "ui/base/l10n/l10n_util.h" | 59 #include "ui/base/l10n/l10n_util.h" |
| 60 | 60 |
| 61 #if defined(OS_CHROMEOS) | 61 #if defined(OS_CHROMEOS) |
| 62 #include "components/signin/core/browser/signin_manager_base.h" | 62 #include "components/signin/core/browser/signin_manager_base.h" |
| 63 #else | 63 #else |
| 64 #include "components/signin/core/browser/signin_manager.h" | 64 #include "components/signin/core/browser/signin_manager.h" |
| 65 #endif | 65 #endif |
| 66 | 66 |
| 67 using browser_sync::ProfileSyncService; |
| 67 using content::WebContents; | 68 using content::WebContents; |
| 68 using l10n_util::GetStringFUTF16; | 69 using l10n_util::GetStringFUTF16; |
| 69 using l10n_util::GetStringUTF16; | 70 using l10n_util::GetStringUTF16; |
| 70 | 71 |
| 71 namespace { | 72 namespace { |
| 72 | 73 |
| 73 // A structure which contains all the configuration information for sync. | 74 // A structure which contains all the configuration information for sync. |
| 74 struct SyncConfigInfo { | 75 struct SyncConfigInfo { |
| 75 SyncConfigInfo(); | 76 SyncConfigInfo(); |
| 76 ~SyncConfigInfo(); | 77 ~SyncConfigInfo(); |
| (...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 944 page, args); | 945 page, args); |
| 945 | 946 |
| 946 // Make sure the tab used for the Gaia sign in does not cover the settings | 947 // Make sure the tab used for the Gaia sign in does not cover the settings |
| 947 // tab. | 948 // tab. |
| 948 FocusUI(); | 949 FocusUI(); |
| 949 } | 950 } |
| 950 | 951 |
| 951 LoginUIService* SyncSetupHandler::GetLoginUIService() const { | 952 LoginUIService* SyncSetupHandler::GetLoginUIService() const { |
| 952 return LoginUIServiceFactory::GetForProfile(GetProfile()); | 953 return LoginUIServiceFactory::GetForProfile(GetProfile()); |
| 953 } | 954 } |
| OLD | NEW |