| 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 "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "chrome/browser/profiles/profile_metrics.h" | 24 #include "chrome/browser/profiles/profile_metrics.h" |
| 25 #include "chrome/browser/signin/chrome_signin_helper.h" | 25 #include "chrome/browser/signin/chrome_signin_helper.h" |
| 26 #include "chrome/browser/signin/signin_error_controller_factory.h" | 26 #include "chrome/browser/signin/signin_error_controller_factory.h" |
| 27 #include "chrome/browser/signin/signin_manager_factory.h" | 27 #include "chrome/browser/signin/signin_manager_factory.h" |
| 28 #include "chrome/browser/signin/signin_promo.h" | 28 #include "chrome/browser/signin/signin_promo.h" |
| 29 #include "chrome/browser/sync/profile_sync_service.h" | 29 #include "chrome/browser/sync/profile_sync_service.h" |
| 30 #include "chrome/browser/sync/profile_sync_service_factory.h" | 30 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 31 #include "chrome/browser/ui/browser_finder.h" | 31 #include "chrome/browser/ui/browser_finder.h" |
| 32 #include "chrome/browser/ui/browser_navigator.h" | 32 #include "chrome/browser/ui/browser_navigator.h" |
| 33 #include "chrome/browser/ui/browser_window.h" | 33 #include "chrome/browser/ui/browser_window.h" |
| 34 #include "chrome/browser/ui/host_desktop.h" |
| 34 #include "chrome/browser/ui/singleton_tabs.h" | 35 #include "chrome/browser/ui/singleton_tabs.h" |
| 35 #include "chrome/browser/ui/webui/options/options_handlers_helper.h" | 36 #include "chrome/browser/ui/webui/options/options_handlers_helper.h" |
| 36 #include "chrome/browser/ui/webui/signin/login_ui_service.h" | 37 #include "chrome/browser/ui/webui/signin/login_ui_service.h" |
| 37 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" | 38 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" |
| 38 #include "chrome/common/chrome_switches.h" | 39 #include "chrome/common/chrome_switches.h" |
| 39 #include "chrome/common/url_constants.h" | 40 #include "chrome/common/url_constants.h" |
| 40 #include "chrome/grit/chromium_strings.h" | 41 #include "chrome/grit/chromium_strings.h" |
| 41 #include "chrome/grit/generated_resources.h" | 42 #include "chrome/grit/generated_resources.h" |
| 42 #include "chrome/grit/locale_settings.h" | 43 #include "chrome/grit/locale_settings.h" |
| 43 #include "components/google/core/browser/google_util.h" | 44 #include "components/google/core/browser/google_util.h" |
| (...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 920 "SyncSetupOverlay.showSyncSetupPage", page, args); | 921 "SyncSetupOverlay.showSyncSetupPage", page, args); |
| 921 | 922 |
| 922 // Make sure the tab used for the Gaia sign in does not cover the settings | 923 // Make sure the tab used for the Gaia sign in does not cover the settings |
| 923 // tab. | 924 // tab. |
| 924 FocusUI(); | 925 FocusUI(); |
| 925 } | 926 } |
| 926 | 927 |
| 927 LoginUIService* SyncSetupHandler::GetLoginUIService() const { | 928 LoginUIService* SyncSetupHandler::GetLoginUIService() const { |
| 928 return LoginUIServiceFactory::GetForProfile(GetProfile()); | 929 return LoginUIServiceFactory::GetForProfile(GetProfile()); |
| 929 } | 930 } |
| OLD | NEW |