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/api/infobars/infobar_tab_service.h" |
7 #include "chrome/browser/extensions/extension_host.h" | 8 #include "chrome/browser/extensions/extension_host.h" |
8 #include "chrome/browser/extensions/extension_process_manager.h" | 9 #include "chrome/browser/extensions/extension_process_manager.h" |
9 #include "chrome/browser/infobars/infobar.h" | 10 #include "chrome/browser/infobars/infobar.h" |
10 #include "chrome/browser/infobars/infobar_tab_helper.h" | |
11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/common/chrome_notification_types.h" | 13 #include "chrome/common/chrome_notification_types.h" |
14 #include "chrome/common/extensions/extension.h" | 14 #include "chrome/common/extensions/extension.h" |
15 #include "content/public/browser/notification_details.h" | 15 #include "content/public/browser/notification_details.h" |
16 #include "content/public/browser/notification_source.h" | 16 #include "content/public/browser/notification_source.h" |
17 | 17 |
18 ExtensionInfoBarDelegate::ExtensionInfoBarDelegate( | 18 ExtensionInfoBarDelegate::ExtensionInfoBarDelegate( |
19 Browser* browser, | 19 Browser* browser, |
20 InfoBarTabHelper* infobar_helper, | 20 InfoBarTabService* infobar_service, |
21 const extensions::Extension* extension, | 21 const extensions::Extension* extension, |
22 const GURL& url, | 22 const GURL& url, |
23 int height) | 23 int height) |
24 : InfoBarDelegate(infobar_helper), | 24 : InfoBarDelegate(infobar_service), |
25 browser_(browser), | 25 browser_(browser), |
26 observer_(NULL), | 26 observer_(NULL), |
27 extension_(extension), | 27 extension_(extension), |
28 closing_(false) { | 28 closing_(false) { |
29 ExtensionProcessManager* manager = | 29 ExtensionProcessManager* manager = |
30 browser->profile()->GetExtensionProcessManager(); | 30 browser->profile()->GetExtensionProcessManager(); |
31 extension_host_.reset(manager->CreateInfobarHost(url, browser)); | 31 extension_host_.reset(manager->CreateInfobarHost(url, browser)); |
32 extension_host_->SetAssociatedWebContents(infobar_helper->web_contents()); | 32 extension_host_->SetAssociatedWebContents(infobar_service->GetWebContents()); |
33 | 33 |
34 registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE, | 34 registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE, |
35 content::Source<Profile>(browser->profile())); | 35 content::Source<Profile>(browser->profile())); |
36 registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED, | 36 registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED, |
37 content::Source<Profile>(browser->profile())); | 37 content::Source<Profile>(browser->profile())); |
38 | 38 |
39 #if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK) | 39 #if defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK) |
40 int default_height = InfoBar::kDefaultBarTargetHeight; | 40 int default_height = InfoBar::kDefaultBarTargetHeight; |
41 #elif defined(OS_MACOSX) | 41 #elif defined(OS_MACOSX) |
42 // TODO(pkasting): Once Infobars have been ported to Mac, we can remove the | 42 // TODO(pkasting): Once Infobars have been ported to Mac, we can remove the |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 RemoveSelf(); | 97 RemoveSelf(); |
98 } else { | 98 } else { |
99 DCHECK(type == chrome::NOTIFICATION_EXTENSION_UNLOADED); | 99 DCHECK(type == chrome::NOTIFICATION_EXTENSION_UNLOADED); |
100 if (extension_ == | 100 if (extension_ == |
101 content::Details<extensions::UnloadedExtensionInfo>( | 101 content::Details<extensions::UnloadedExtensionInfo>( |
102 details)->extension) { | 102 details)->extension) { |
103 RemoveSelf(); | 103 RemoveSelf(); |
104 } | 104 } |
105 } | 105 } |
106 } | 106 } |
OLD | NEW |