| 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 3690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3701 void Browser::ShowRepostFormWarningDialog(TabContents *tab_contents) { | 3701 void Browser::ShowRepostFormWarningDialog(TabContents *tab_contents) { |
| 3702 window()->ShowRepostFormWarningDialog(tab_contents); | 3702 window()->ShowRepostFormWarningDialog(tab_contents); |
| 3703 } | 3703 } |
| 3704 | 3704 |
| 3705 void Browser::ShowContentSettingsPage(ContentSettingsType content_type) { | 3705 void Browser::ShowContentSettingsPage(ContentSettingsType content_type) { |
| 3706 ShowOptionsTab( | 3706 ShowOptionsTab( |
| 3707 chrome::kContentSettingsExceptionsSubPage + std::string(kHashMark) + | 3707 chrome::kContentSettingsExceptionsSubPage + std::string(kHashMark) + |
| 3708 ContentSettingsHandler::ContentSettingsTypeToGroupName(content_type)); | 3708 ContentSettingsHandler::ContentSettingsTypeToGroupName(content_type)); |
| 3709 } | 3709 } |
| 3710 | 3710 |
| 3711 void Browser::ShowCollectedCookiesDialog(TabContents *tab_contents) { | 3711 void Browser::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) { |
| 3712 window()->ShowCollectedCookiesDialog(tab_contents); | 3712 window()->ShowCollectedCookiesDialog(wrapper); |
| 3713 } | 3713 } |
| 3714 | 3714 |
| 3715 bool Browser::ShouldAddNavigationToHistory( | 3715 bool Browser::ShouldAddNavigationToHistory( |
| 3716 const history::HistoryAddPageArgs& add_page_args, | 3716 const history::HistoryAddPageArgs& add_page_args, |
| 3717 NavigationType::Type navigation_type) { | 3717 NavigationType::Type navigation_type) { |
| 3718 // Don't update history if running as app. | 3718 // Don't update history if running as app. |
| 3719 return !IsApplication(); | 3719 return !IsApplication(); |
| 3720 } | 3720 } |
| 3721 | 3721 |
| 3722 void Browser::ContentRestrictionsChanged(TabContents* source) { | 3722 void Browser::ContentRestrictionsChanged(TabContents* source) { |
| (...skipping 1453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5176 } | 5176 } |
| 5177 | 5177 |
| 5178 void Browser::ShowSyncSetup() { | 5178 void Browser::ShowSyncSetup() { |
| 5179 ProfileSyncService* service = | 5179 ProfileSyncService* service = |
| 5180 profile()->GetOriginalProfile()->GetProfileSyncService(); | 5180 profile()->GetOriginalProfile()->GetProfileSyncService(); |
| 5181 if (service->HasSyncSetupCompleted()) | 5181 if (service->HasSyncSetupCompleted()) |
| 5182 ShowOptionsTab(chrome::kSyncSetupSubPage); | 5182 ShowOptionsTab(chrome::kSyncSetupSubPage); |
| 5183 else | 5183 else |
| 5184 service->ShowLoginDialog(); | 5184 service->ShowLoginDialog(); |
| 5185 } | 5185 } |
| OLD | NEW |