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/sync/profile_sync_service.h" | 5 #include "chrome/browser/sync/profile_sync_service.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
957 else | 957 else |
958 ShowSyncSetup(SyncSetupWizard::CONFIGURE); | 958 ShowSyncSetup(SyncSetupWizard::CONFIGURE); |
959 } | 959 } |
960 | 960 |
961 void ProfileSyncService::ShowSyncSetup(SyncSetupWizard::State state) { | 961 void ProfileSyncService::ShowSyncSetup(SyncSetupWizard::State state) { |
962 wizard_.Step(state); | 962 wizard_.Step(state); |
963 Browser* browser = BrowserList::GetLastActiveWithProfile(profile()); | 963 Browser* browser = BrowserList::GetLastActiveWithProfile(profile()); |
964 if (!browser) { | 964 if (!browser) { |
965 browser = Browser::Create(profile()); | 965 browser = Browser::Create(profile()); |
966 browser->ShowOptionsTab(chrome::kSyncSetupSubPage); | 966 browser->ShowOptionsTab(chrome::kSyncSetupSubPage); |
967 browser->window()->Show(); | 967 browser->window()->Show(BrowserWindow::SHOW_CONTEXT_NORMAL); |
968 } else { | 968 } else { |
969 browser->ShowOptionsTab(chrome::kSyncSetupSubPage); | 969 browser->ShowOptionsTab(chrome::kSyncSetupSubPage); |
970 } | 970 } |
971 } | 971 } |
972 | 972 |
973 SyncBackendHost::StatusSummary ProfileSyncService::QuerySyncStatusSummary() { | 973 SyncBackendHost::StatusSummary ProfileSyncService::QuerySyncStatusSummary() { |
974 if (backend_.get() && backend_initialized_) | 974 if (backend_.get() && backend_initialized_) |
975 return backend_->GetStatusSummary(); | 975 return backend_->GetStatusSummary(); |
976 else | 976 else |
977 return SyncBackendHost::Status::OFFLINE_UNUSABLE; | 977 return SyncBackendHost::Status::OFFLINE_UNUSABLE; |
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1574 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes)); | 1574 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes)); |
1575 syncable::ModelTypeSet registered; | 1575 syncable::ModelTypeSet registered; |
1576 GetRegisteredDataTypes(®istered); | 1576 GetRegisteredDataTypes(®istered); |
1577 syncable::ModelTypeBitSet registered_bit_set = | 1577 syncable::ModelTypeBitSet registered_bit_set = |
1578 syncable::ModelTypeBitSetFromSet(registered); | 1578 syncable::ModelTypeBitSetFromSet(registered); |
1579 unacknowledged = registered_bit_set & ~acknowledged; | 1579 unacknowledged = registered_bit_set & ~acknowledged; |
1580 } | 1580 } |
1581 return unacknowledged; | 1581 return unacknowledged; |
1582 } | 1582 } |
1583 | 1583 |
OLD | NEW |