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" |
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
383 break; | 383 break; |
384 default: | 384 default: |
385 break; | 385 break; |
386 } | 386 } |
387 | 387 |
388 service_->OnUserCancelledDialog(); | 388 service_->OnUserCancelledDialog(); |
389 delete this; | 389 delete this; |
390 } | 390 } |
391 | 391 |
392 std::wstring SyncSetupFlow::GetDialogTitle() const { | 392 std::wstring SyncSetupFlow::GetDialogTitle() const { |
393 return l10n_util::GetString(IDS_SYNC_MY_BOOKMARKS_LABEL); | 393 return UTF16ToWideHack( |
| 394 l10n_util::GetStringUTF16(IDS_SYNC_MY_BOOKMARKS_LABEL)); |
394 } | 395 } |
395 | 396 |
396 bool SyncSetupFlow::IsDialogModal() const { | 397 bool SyncSetupFlow::IsDialogModal() const { |
397 return false; | 398 return false; |
398 } | 399 } |
399 | 400 |
400 bool SyncSetupFlow::ShouldShowDialogTitle() const { | 401 bool SyncSetupFlow::ShouldShowDialogTitle() const { |
401 return true; | 402 return true; |
402 } | 403 } |
403 | 404 |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
709 const std::string& mode) { | 710 const std::string& mode) { |
710 if (current_state_ == SyncSetupWizard::ENTER_PASSPHRASE) { | 711 if (current_state_ == SyncSetupWizard::ENTER_PASSPHRASE) { |
711 service_->SetPassphrase(passphrase, mode == std::string("enter")); | 712 service_->SetPassphrase(passphrase, mode == std::string("enter")); |
712 Advance(SyncSetupWizard::SETTING_UP); | 713 Advance(SyncSetupWizard::SETTING_UP); |
713 } else if (configuration_pending_) { | 714 } else if (configuration_pending_) { |
714 DCHECK_EQ(SyncSetupWizard::CREATE_PASSPHRASE, current_state_); | 715 DCHECK_EQ(SyncSetupWizard::CREATE_PASSPHRASE, current_state_); |
715 configuration_.secondary_passphrase = passphrase; | 716 configuration_.secondary_passphrase = passphrase; |
716 OnConfigurationComplete(); | 717 OnConfigurationComplete(); |
717 } | 718 } |
718 } | 719 } |
OLD | NEW |