| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/infobars/infobar_service.h" | 5 #include "chrome/browser/infobars/infobar_service.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
| 9 #include "chrome/browser/infobars/insecure_content_infobar_delegate.h" | 9 #include "chrome/browser/infobars/insecure_content_infobar_delegate.h" |
| 10 #include "chrome/common/render_messages.h" | 10 #include "chrome/common/render_messages.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 web_contents()->RemoveUserData(UserDataKey()); | 123 web_contents()->RemoveUserData(UserDataKey()); |
| 124 // That was the equivalent of "delete this". This object is now destroyed; | 124 // That was the equivalent of "delete this". This object is now destroyed; |
| 125 // returning from this function is the only safe thing to do. | 125 // returning from this function is the only safe thing to do. |
| 126 } | 126 } |
| 127 | 127 |
| 128 bool InfoBarService::OnMessageReceived(const IPC::Message& message) { | 128 bool InfoBarService::OnMessageReceived(const IPC::Message& message) { |
| 129 bool handled = true; | 129 bool handled = true; |
| 130 IPC_BEGIN_MESSAGE_MAP(InfoBarService, message) | 130 IPC_BEGIN_MESSAGE_MAP(InfoBarService, message) |
| 131 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidBlockDisplayingInsecureContent, | 131 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidBlockDisplayingInsecureContent, |
| 132 OnDidBlockDisplayingInsecureContent) | 132 OnDidBlockDisplayingInsecureContent) |
| 133 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidBlockRunningInsecureContent, | |
| 134 OnDidBlockRunningInsecureContent) | |
| 135 IPC_MESSAGE_UNHANDLED(handled = false) | 133 IPC_MESSAGE_UNHANDLED(handled = false) |
| 136 IPC_END_MESSAGE_MAP() | 134 IPC_END_MESSAGE_MAP() |
| 137 return handled; | 135 return handled; |
| 138 } | 136 } |
| 139 | 137 |
| 140 void InfoBarService::OnDidBlockDisplayingInsecureContent() { | 138 void InfoBarService::OnDidBlockDisplayingInsecureContent() { |
| 141 InsecureContentInfoBarDelegate::Create( | 139 InsecureContentInfoBarDelegate::Create(this); |
| 142 this, InsecureContentInfoBarDelegate::DISPLAY); | |
| 143 } | 140 } |
| 144 | |
| 145 void InfoBarService::OnDidBlockRunningInsecureContent() { | |
| 146 InsecureContentInfoBarDelegate::Create(this, | |
| 147 InsecureContentInfoBarDelegate::RUN); | |
| 148 } | |
| OLD | NEW |