| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/sync/sync_setup_flow.h" | 5 #include "chrome/browser/sync/sync_setup_flow.h" |
| 6 | 6 |
| 7 #include "app/gfx/font_util.h" | 7 #include "app/gfx/font_util.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
| 11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
| 12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 14 #include "base/values.h" | 14 #include "base/values.h" |
| 15 #include "chrome/browser/dom_ui/dom_ui_util.h" | 15 #include "chrome/browser/dom_ui/dom_ui_util.h" |
| 16 #include "chrome/browser/platform_util.h" | 16 #include "chrome/browser/platform_util.h" |
| 17 #include "chrome/browser/prefs/pref_service.h" | 17 #include "chrome/browser/prefs/pref_service.h" |
| 18 #include "chrome/browser/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
| 19 #include "chrome/browser/renderer_host/render_view_host.h" | 19 #include "chrome/browser/renderer_host/render_view_host.h" |
| 20 #include "chrome/browser/sync/profile_sync_service.h" | 20 #include "chrome/browser/sync/profile_sync_service.h" |
| 21 #include "chrome/browser/tab_contents/tab_contents.h" | 21 #include "chrome/browser/tab_contents/tab_contents.h" |
| 22 #include "chrome/browser/ui/browser.h" | 22 #include "chrome/browser/ui/browser.h" |
| 23 #include "chrome/browser/ui/browser_list.h" | 23 #include "chrome/browser/ui/browser_list.h" |
| 24 #if defined(OS_MACOSX) | 24 #if defined(OS_MACOSX) |
| 25 #include "chrome/browser/ui/cocoa/html_dialog_window_controller_cppsafe.h" | 25 #include "chrome/browser/ui/cocoa/html_dialog_window_controller_cppsafe.h" |
| 26 #endif | 26 #endif |
| 27 #include "chrome/common/net/gaia/google_service_auth_error.h" | 27 #include "chrome/common/net/gaia/google_service_auth_error.h" |
| 28 #include "chrome/common/pref_names.h" | 28 #include "chrome/common/pref_names.h" |
| (...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 const std::string& mode) { | 689 const std::string& mode) { |
| 690 if (current_state_ == SyncSetupWizard::ENTER_PASSPHRASE) { | 690 if (current_state_ == SyncSetupWizard::ENTER_PASSPHRASE) { |
| 691 service_->SetPassphrase(passphrase, mode == std::string("enter")); | 691 service_->SetPassphrase(passphrase, mode == std::string("enter")); |
| 692 Advance(SyncSetupWizard::SETTING_UP); | 692 Advance(SyncSetupWizard::SETTING_UP); |
| 693 } else if (configuration_pending_) { | 693 } else if (configuration_pending_) { |
| 694 DCHECK_EQ(SyncSetupWizard::CREATE_PASSPHRASE, current_state_); | 694 DCHECK_EQ(SyncSetupWizard::CREATE_PASSPHRASE, current_state_); |
| 695 configuration_.secondary_passphrase = passphrase; | 695 configuration_.secondary_passphrase = passphrase; |
| 696 OnConfigurationComplete(); | 696 OnConfigurationComplete(); |
| 697 } | 697 } |
| 698 } | 698 } |
| OLD | NEW |