Chromium Code Reviews| Index: chrome/browser/ui/browser.cc |
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc |
| index 46a8e6495b000cf5aa89635ad2310fac9c224019..55ed84afb2bf656197c319809e81b7fbe09e9e74 100644 |
| --- a/chrome/browser/ui/browser.cc |
| +++ b/chrome/browser/ui/browser.cc |
| @@ -44,6 +44,7 @@ |
| #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" |
| #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h" |
| +#include "chrome/browser/custom_handlers/register_protocol_handler_permission_request.h" |
| #include "chrome/browser/defaults.h" |
| #include "chrome/browser/devtools/devtools_toggle_action.h" |
| #include "chrome/browser/devtools/devtools_window.h" |
| @@ -134,6 +135,7 @@ |
| #include "chrome/browser/ui/unload_controller.h" |
| #include "chrome/browser/ui/validation_message_bubble.h" |
| #include "chrome/browser/ui/web_applications/web_app_ui.h" |
| +#include "chrome/browser/ui/website_settings/permission_bubble_manager.h" |
| #include "chrome/browser/ui/webui/signin/login_ui_service.h" |
| #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" |
| #include "chrome/browser/ui/window_sizer/window_sizer.h" |
| @@ -1622,6 +1624,15 @@ void Browser::RegisterProtocolHandler(WebContents* web_contents, |
| window_->GetLocationBar()->UpdateContentSettingsIcons(); |
| } |
| + if (PermissionBubbleManager::Enabled() && |
| + PermissionBubbleManager::FromWebContents(web_contents)) { |
| + PermissionBubbleManager* bubble_manager = |
| + PermissionBubbleManager::FromWebContents(web_contents); |
|
Lei Zhang
2014/02/13 21:48:30
Reuse the result from line 1628?
Peter Kasting
2014/02/13 21:50:36
SGTM
Greg Billock
2014/02/13 22:49:03
Done.
|
| + bubble_manager->AddRequest(new RegisterProtocolHandlerPermissionRequest( |
|
Peter Kasting
2014/02/13 21:50:36
Tiny nit: I would probably break before "new" inst
Greg Billock
2014/02/13 22:49:03
Done.
|
| + registry, handler)); |
| + return; |
|
Peter Kasting
2014/02/13 21:50:36
Nit: Instead of this return I'd do "else" after th
Greg Billock
2014/02/13 22:49:03
Done.
|
| + } |
| + |
| RegisterProtocolHandlerInfoBarDelegate::Create( |
| InfoBarService::FromWebContents(web_contents), registry, handler); |
| } |