| 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 3752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3763 fullscreen_controller_->HandleUserPressedEscape()) { | 3763 fullscreen_controller_->HandleUserPressedEscape()) { |
| 3764 return true; | 3764 return true; |
| 3765 } | 3765 } |
| 3766 return window()->PreHandleKeyboardEvent(event, is_keyboard_shortcut); | 3766 return window()->PreHandleKeyboardEvent(event, is_keyboard_shortcut); |
| 3767 } | 3767 } |
| 3768 | 3768 |
| 3769 void Browser::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { | 3769 void Browser::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { |
| 3770 window()->HandleKeyboardEvent(event); | 3770 window()->HandleKeyboardEvent(event); |
| 3771 } | 3771 } |
| 3772 | 3772 |
| 3773 void Browser::ShowRepostFormWarningDialog(TabContents *tab_contents) { | 3773 void Browser::ShowTabModalDialog(TabModalDialogDelegate* delegate, |
| 3774 window()->ShowRepostFormWarningDialog(tab_contents); | 3774 TabContents* tab_contents) { |
| 3775 window()->ShowTabModalDialog(delegate, tab_contents); |
| 3775 } | 3776 } |
| 3776 | 3777 |
| 3777 void Browser::ShowContentSettingsPage(ContentSettingsType content_type) { | 3778 void Browser::ShowContentSettingsPage(ContentSettingsType content_type) { |
| 3778 ShowOptionsTab( | 3779 ShowOptionsTab( |
| 3779 chrome::kContentSettingsExceptionsSubPage + std::string(kHashMark) + | 3780 chrome::kContentSettingsExceptionsSubPage + std::string(kHashMark) + |
| 3780 ContentSettingsHandler::ContentSettingsTypeToGroupName(content_type)); | 3781 ContentSettingsHandler::ContentSettingsTypeToGroupName(content_type)); |
| 3781 } | 3782 } |
| 3782 | 3783 |
| 3783 void Browser::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) { | 3784 void Browser::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) { |
| 3784 window()->ShowCollectedCookiesDialog(wrapper); | 3785 window()->ShowCollectedCookiesDialog(wrapper); |
| (...skipping 1538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5323 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); | 5324 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); |
| 5324 } else { | 5325 } else { |
| 5325 GlobalErrorService* service = | 5326 GlobalErrorService* service = |
| 5326 GlobalErrorServiceFactory::GetForProfile(profile()); | 5327 GlobalErrorServiceFactory::GetForProfile(profile()); |
| 5327 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5328 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
| 5328 if (error) { | 5329 if (error) { |
| 5329 error->ShowBubbleView(this); | 5330 error->ShowBubbleView(this); |
| 5330 } | 5331 } |
| 5331 } | 5332 } |
| 5332 } | 5333 } |
| OLD | NEW |