| 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 4774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4785 } | 4785 } |
| 4786 | 4786 |
| 4787 BookmarkBar::AnimateChangeType animate_type = | 4787 BookmarkBar::AnimateChangeType animate_type = |
| 4788 (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ? | 4788 (reason == BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE) ? |
| 4789 BookmarkBar::ANIMATE_STATE_CHANGE : | 4789 BookmarkBar::ANIMATE_STATE_CHANGE : |
| 4790 BookmarkBar::DONT_ANIMATE_STATE_CHANGE; | 4790 BookmarkBar::DONT_ANIMATE_STATE_CHANGE; |
| 4791 window_->BookmarkBarStateChanged(animate_type); | 4791 window_->BookmarkBarStateChanged(animate_type); |
| 4792 } | 4792 } |
| 4793 | 4793 |
| 4794 void Browser::ShowSyncSetup() { | 4794 void Browser::ShowSyncSetup() { |
| 4795 ProfileSyncService* service = profile()->GetProfileSyncService(); | 4795 ProfileSyncService* service = |
| 4796 profile()->GetOriginalProfile()->GetProfileSyncService(); |
| 4796 if (service->HasSyncSetupCompleted()) | 4797 if (service->HasSyncSetupCompleted()) |
| 4797 ShowOptionsTab(chrome::kSyncSetupSubPage); | 4798 ShowOptionsTab(chrome::kSyncSetupSubPage); |
| 4798 else | 4799 else |
| 4799 profile()->GetProfileSyncService()->ShowLoginDialog(); | 4800 service->ShowLoginDialog(); |
| 4800 } | 4801 } |
| OLD | NEW |