| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/options_sync_setup_handler.h" | 5 #include "chrome/browser/ui/webui/options/options_sync_setup_handler.h" |
| 6 | 6 |
| 7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
| 8 #include "chrome/browser/sync/profile_sync_service.h" | 8 #include "chrome/browser/sync/profile_sync_service.h" |
| 9 | 9 |
| 10 void OptionsSyncSetupHandler::ShowSetupUI() { | 10 void OptionsSyncSetupHandler::ShowSetupUI() { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 if (service->IsPassphraseRequiredForDecryption()) { | 25 if (service->IsPassphraseRequiredForDecryption()) { |
| 26 service->get_wizard().Step(SyncSetupWizard::ENTER_PASSPHRASE); | 26 service->get_wizard().Step(SyncSetupWizard::ENTER_PASSPHRASE); |
| 27 } else { | 27 } else { |
| 28 service->get_wizard().Step(SyncSetupWizard::CONFIGURE); | 28 service->get_wizard().Step(SyncSetupWizard::CONFIGURE); |
| 29 } | 29 } |
| 30 } else { | 30 } else { |
| 31 service->get_wizard().Step(SyncSetupWizard::GetLoginState()); | 31 service->get_wizard().Step(SyncSetupWizard::GetLoginState()); |
| 32 } | 32 } |
| 33 | 33 |
| 34 // Show the Sync Setup page. | 34 // Show the Sync Setup page. |
| 35 scoped_ptr<Value> page(Value::CreateStringValue("syncSetup")); | 35 scoped_ptr<Value> page(base::StringValue::New("syncSetup")); |
| 36 web_ui_->CallJavascriptFunction("OptionsPage.navigateToPage", *page); | 36 web_ui_->CallJavascriptFunction("OptionsPage.navigateToPage", *page); |
| 37 } | 37 } |
| OLD | NEW |