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 "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_module_constants.h" | 11 #include "chrome/browser/extensions/extension_infobar_module_constants.h" |
12 #include "chrome/browser/extensions/extension_infobar_delegate.h" | 12 #include "chrome/browser/extensions/extension_infobar_delegate.h" |
13 #include "chrome/browser/extensions/extension_tabs_module.h" | 13 #include "chrome/browser/extensions/extension_tabs_module.h" |
14 #include "chrome/browser/extensions/extension_tabs_module_constants.h" | 14 #include "chrome/browser/extensions/extension_tabs_module_constants.h" |
15 #include "chrome/browser/tab_contents/infobar_delegate.h" | 15 #include "chrome/browser/tab_contents/infobar_delegate.h" |
16 #include "chrome/browser/tab_contents/tab_contents.h" | 16 #include "chrome/browser/tab_contents/tab_contents.h" |
17 #include "chrome/browser/tab_contents_wrapper.h" | |
18 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
| 18 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
19 #include "chrome/common/extensions/extension.h" | 19 #include "chrome/common/extensions/extension.h" |
20 #include "chrome/common/extensions/extension_error_utils.h" | 20 #include "chrome/common/extensions/extension_error_utils.h" |
21 #include "chrome/common/url_constants.h" | 21 #include "chrome/common/url_constants.h" |
22 #include "grit/generated_resources.h" | 22 #include "grit/generated_resources.h" |
23 | 23 |
24 namespace keys = extension_infobar_module_constants; | 24 namespace keys = extension_infobar_module_constants; |
25 | 25 |
26 bool ShowInfoBarFunction::RunImpl() { | 26 bool ShowInfoBarFunction::RunImpl() { |
27 DictionaryValue* args; | 27 DictionaryValue* args; |
28 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args)); | 28 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args)); |
(...skipping 25 matching lines...) Expand all Loading... |
54 | 54 |
55 tab_contents->tab_contents()->AddInfoBar( | 55 tab_contents->tab_contents()->AddInfoBar( |
56 new ExtensionInfoBarDelegate(browser, tab_contents->tab_contents(), | 56 new ExtensionInfoBarDelegate(browser, tab_contents->tab_contents(), |
57 GetExtension(), url)); | 57 GetExtension(), url)); |
58 | 58 |
59 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. | 59 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. |
60 result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false)); | 60 result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false)); |
61 | 61 |
62 return true; | 62 return true; |
63 } | 63 } |
OLD | NEW |