Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 // defined(OS_WIN) | 10 #endif // defined(OS_WIN) |
| (...skipping 1742 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1753 // Make sure content-setting icon is turned off in case the page does | 1753 // Make sure content-setting icon is turned off in case the page does |
| 1754 // ungestured and gestured RPH calls. | 1754 // ungestured and gestured RPH calls. |
| 1755 if (window_) { | 1755 if (window_) { |
| 1756 tab_content_settings->ClearPendingProtocolHandler(); | 1756 tab_content_settings->ClearPendingProtocolHandler(); |
| 1757 window_->GetLocationBar()->UpdateContentSettingsIcons(); | 1757 window_->GetLocationBar()->UpdateContentSettingsIcons(); |
| 1758 } | 1758 } |
| 1759 | 1759 |
| 1760 PermissionBubbleManager* bubble_manager = | 1760 PermissionBubbleManager* bubble_manager = |
| 1761 PermissionBubbleManager::FromWebContents(web_contents); | 1761 PermissionBubbleManager::FromWebContents(web_contents); |
| 1762 if (PermissionBubbleManager::Enabled() && bubble_manager) { | 1762 if (PermissionBubbleManager::Enabled() && bubble_manager) { |
| 1763 bubble_manager->SetBrowser(this); | |
|
please use gerrit instead
2015/08/07 23:02:26
Hmmm.
hcarmona
2015/08/11 02:35:45
Gone! :D
| |
| 1763 bubble_manager->AddRequest( | 1764 bubble_manager->AddRequest( |
| 1764 new RegisterProtocolHandlerPermissionRequest(registry, handler, | 1765 new RegisterProtocolHandlerPermissionRequest(registry, handler, |
| 1765 url, user_gesture)); | 1766 url, user_gesture)); |
| 1766 } else { | 1767 } else { |
| 1767 RegisterProtocolHandlerInfoBarDelegate::Create( | 1768 RegisterProtocolHandlerInfoBarDelegate::Create( |
| 1768 InfoBarService::FromWebContents(web_contents), registry, handler); | 1769 InfoBarService::FromWebContents(web_contents), registry, handler); |
| 1769 } | 1770 } |
| 1770 } | 1771 } |
| 1771 | 1772 |
| 1772 void Browser::UnregisterProtocolHandler(WebContents* web_contents, | 1773 void Browser::UnregisterProtocolHandler(WebContents* web_contents, |
| (...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2626 if (contents && !allow_js_access) { | 2627 if (contents && !allow_js_access) { |
| 2627 contents->web_contents()->GetController().LoadURL( | 2628 contents->web_contents()->GetController().LoadURL( |
| 2628 target_url, | 2629 target_url, |
| 2629 content::Referrer(), | 2630 content::Referrer(), |
| 2630 ui::PAGE_TRANSITION_LINK, | 2631 ui::PAGE_TRANSITION_LINK, |
| 2631 std::string()); // No extra headers. | 2632 std::string()); // No extra headers. |
| 2632 } | 2633 } |
| 2633 | 2634 |
| 2634 return contents != NULL; | 2635 return contents != NULL; |
| 2635 } | 2636 } |
| OLD | NEW |