OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/extensions/extension_infobar_delegate.h" | 5 #include "chrome/browser/extensions/extension_infobar_delegate.h" |
6 | 6 |
7 #include "chrome/browser/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
8 #include "chrome/browser/extensions/extension_view_host.h" | 8 #include "chrome/browser/extensions/extension_view_host.h" |
9 #include "chrome/browser/extensions/extension_view_host_factory.h" | 9 #include "chrome/browser/extensions/extension_view_host_factory.h" |
10 #include "chrome/browser/infobars/infobar_service.h" | 10 #include "chrome/browser/infobars/infobar_service.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 extensions::ExtensionViewHostFactory::CreateInfobarHost(url, browser)); | 48 extensions::ExtensionViewHostFactory::CreateInfobarHost(url, browser)); |
49 extension_view_host_->SetAssociatedWebContents(web_contents); | 49 extension_view_host_->SetAssociatedWebContents(web_contents); |
50 | 50 |
51 extension_registry_observer_.Add( | 51 extension_registry_observer_.Add( |
52 extensions::ExtensionRegistry::Get(browser->profile())); | 52 extensions::ExtensionRegistry::Get(browser->profile())); |
53 registrar_.Add(this, | 53 registrar_.Add(this, |
54 extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE, | 54 extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE, |
55 content::Source<Profile>(browser->profile())); | 55 content::Source<Profile>(browser->profile())); |
56 | 56 |
57 height_ = std::max(0, height); | 57 height_ = std::max(0, height); |
58 height_ = std::min(2 * infobars::InfoBar::kDefaultBarTargetHeight, height_); | 58 height_ = std::min(2 * infobars::InfoBar::gDefaultBarTargetHeight, height_); |
59 if (height_ == 0) | 59 if (height_ == 0) |
60 height_ = infobars::InfoBar::kDefaultBarTargetHeight; | 60 height_ = infobars::InfoBar::gDefaultBarTargetHeight; |
61 } | 61 } |
62 | 62 |
63 content::WebContents* ExtensionInfoBarDelegate::GetWebContents() { | 63 content::WebContents* ExtensionInfoBarDelegate::GetWebContents() { |
64 return InfoBarService::WebContentsFromInfoBar(infobar()); | 64 return InfoBarService::WebContentsFromInfoBar(infobar()); |
65 } | 65 } |
66 | 66 |
67 // ExtensionInfoBarDelegate::CreateInfoBar() is implemented in platform-specific | 67 // ExtensionInfoBarDelegate::CreateInfoBar() is implemented in platform-specific |
68 // files. | 68 // files. |
69 | 69 |
70 bool ExtensionInfoBarDelegate::EqualsDelegate( | 70 bool ExtensionInfoBarDelegate::EqualsDelegate( |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 | 108 |
109 void ExtensionInfoBarDelegate::Observe( | 109 void ExtensionInfoBarDelegate::Observe( |
110 int type, | 110 int type, |
111 const content::NotificationSource& source, | 111 const content::NotificationSource& source, |
112 const content::NotificationDetails& details) { | 112 const content::NotificationDetails& details) { |
113 DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE); | 113 DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE); |
114 if (extension_view_host_.get() == | 114 if (extension_view_host_.get() == |
115 content::Details<extensions::ExtensionHost>(details).ptr()) | 115 content::Details<extensions::ExtensionHost>(details).ptr()) |
116 infobar()->RemoveSelf(); | 116 infobar()->RemoveSelf(); |
117 } | 117 } |
OLD | NEW |