| Index: chrome/browser/ui/webui/sync_setup_handler.cc
|
| diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
|
| index 6e68d8b45591e29df6c0f2d49d956ac90309e0d6..2090f4756eb7711d525854eff201d6745c7df7e7 100644
|
| --- a/chrome/browser/ui/webui/sync_setup_handler.cc
|
| +++ b/chrome/browser/ui/webui/sync_setup_handler.cc
|
| @@ -40,6 +40,8 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/url_constants.h"
|
| +#include "chrome/grit/chromium_strings.h"
|
| +#include "chrome/grit/generated_resources.h"
|
| #include "components/google/core/browser/google_util.h"
|
| #include "components/signin/core/browser/profile_oauth2_token_service.h"
|
| #include "components/signin/core/browser/signin_error_controller.h"
|
| @@ -51,8 +53,6 @@
|
| #include "content/public/browser/web_contents_delegate.h"
|
| #include "google_apis/gaia/gaia_auth_util.h"
|
| #include "google_apis/gaia/gaia_constants.h"
|
| -#include "grit/chromium_strings.h"
|
| -#include "grit/generated_resources.h"
|
| #include "grit/locale_settings.h"
|
| #include "net/base/url_util.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -555,7 +555,6 @@ void SyncSetupHandler::DisplayGaiaLoginInNewTabOrWindow() {
|
| #endif
|
|
|
| bool SyncSetupHandler::PrepareSyncSetup() {
|
| -
|
| // If the wizard is already visible, just focus that one.
|
| if (FocusExistingWizardIfPresent()) {
|
| if (!IsActiveLogin())
|
|
|