OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_extension_api.h" | 5 #include "chrome/browser/infobars/infobar_extension_api.h" |
6 | 6 |
7 #include "base/string_number_conversions.h" | 7 #include "base/string_number_conversions.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/browser/extensions/extension_host.h" | 10 #include "chrome/browser/extensions/extension_host.h" |
11 #include "chrome/browser/extensions/extension_infobar_delegate.h" | 11 #include "chrome/browser/extensions/extension_infobar_delegate.h" |
12 #include "chrome/browser/extensions/extension_tab_util.h" | 12 #include "chrome/browser/extensions/extension_tab_util.h" |
13 #include "chrome/browser/extensions/extension_tabs_module_constants.h" | 13 #include "chrome/browser/extensions/extension_tabs_module_constants.h" |
| 14 #include "chrome/browser/extensions/extension_window_controller.h" |
14 #include "chrome/browser/infobars/infobar_tab_helper.h" | 15 #include "chrome/browser/infobars/infobar_tab_helper.h" |
15 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" | 16 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" |
16 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 18 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
18 #include "chrome/common/extensions/extension.h" | 19 #include "chrome/common/extensions/extension.h" |
19 #include "chrome/common/extensions/extension_error_utils.h" | 20 #include "chrome/common/extensions/extension_error_utils.h" |
20 #include "chrome/common/url_constants.h" | 21 #include "chrome/common/url_constants.h" |
21 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
22 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
23 | 24 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 extension_tabs_module_constants::kTabNotFoundError, | 64 extension_tabs_module_constants::kTabNotFoundError, |
64 base::IntToString(tab_id)); | 65 base::IntToString(tab_id)); |
65 return false; | 66 return false; |
66 } | 67 } |
67 | 68 |
68 tab_contents->infobar_tab_helper()->AddInfoBar( | 69 tab_contents->infobar_tab_helper()->AddInfoBar( |
69 new ExtensionInfoBarDelegate(browser, tab_contents->infobar_tab_helper(), | 70 new ExtensionInfoBarDelegate(browser, tab_contents->infobar_tab_helper(), |
70 GetExtension(), url, height)); | 71 GetExtension(), url, height)); |
71 | 72 |
72 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. | 73 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. |
73 result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false)); | 74 DCHECK(browser->extension_window_controller()); |
| 75 result_.reset(browser->extension_window_controller()->CreateWindowValue()); |
74 | 76 |
75 return true; | 77 return true; |
76 } | 78 } |
OLD | NEW |