OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_module.h" | 5 #include "chrome/browser/extensions/extension_infobar_module.h" |
6 | 6 |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "base/values.h" |
9 #include "chrome/browser/browser.h" | 10 #include "chrome/browser/browser.h" |
10 #include "chrome/browser/extensions/extension_host.h" | 11 #include "chrome/browser/extensions/extension_host.h" |
11 #include "chrome/browser/extensions/extension_infobar_module_constants.h" | 12 #include "chrome/browser/extensions/extension_infobar_module_constants.h" |
12 #include "chrome/browser/extensions/extension_infobar_delegate.h" | 13 #include "chrome/browser/extensions/extension_infobar_delegate.h" |
13 #include "chrome/browser/extensions/extension_tabs_module.h" | 14 #include "chrome/browser/extensions/extension_tabs_module.h" |
14 #include "chrome/browser/extensions/extension_tabs_module_constants.h" | 15 #include "chrome/browser/extensions/extension_tabs_module_constants.h" |
15 #include "chrome/browser/tab_contents/infobar_delegate.h" | 16 #include "chrome/browser/tab_contents/infobar_delegate.h" |
16 #include "chrome/browser/tab_contents/tab_contents.h" | 17 #include "chrome/browser/tab_contents/tab_contents.h" |
17 #include "chrome/common/extensions/extension.h" | 18 #include "chrome/common/extensions/extension.h" |
18 #include "chrome/common/extensions/extension_error_utils.h" | 19 #include "chrome/common/extensions/extension_error_utils.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 } | 52 } |
52 | 53 |
53 tab_contents->AddInfoBar( | 54 tab_contents->AddInfoBar( |
54 new ExtensionInfoBarDelegate(browser, tab_contents, GetExtension(), url)); | 55 new ExtensionInfoBarDelegate(browser, tab_contents, GetExtension(), url)); |
55 | 56 |
56 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. | 57 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. |
57 result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false)); | 58 result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false)); |
58 | 59 |
59 return true; | 60 return true; |
60 } | 61 } |
OLD | NEW |