| 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" |
| 17 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.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 "grit/generated_resources.h" | 22 #include "grit/generated_resources.h" |
| 22 | 23 |
| 23 namespace keys = extension_infobar_module_constants; | 24 namespace keys = extension_infobar_module_constants; |
| 24 | 25 |
| 25 bool ShowInfoBarFunction::RunImpl() { | 26 bool ShowInfoBarFunction::RunImpl() { |
| 26 DictionaryValue* args; | 27 DictionaryValue* args; |
| 27 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args)); | 28 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args)); |
| 28 | 29 |
| 29 int tab_id; | 30 int tab_id; |
| 30 EXTENSION_FUNCTION_VALIDATE(args->GetInteger(keys::kTabId, &tab_id)); | 31 EXTENSION_FUNCTION_VALIDATE(args->GetInteger(keys::kTabId, &tab_id)); |
| 31 | 32 |
| 32 std::string html_path; | 33 std::string html_path; |
| 33 EXTENSION_FUNCTION_VALIDATE(args->GetString(keys::kHtmlPath, &html_path)); | 34 EXTENSION_FUNCTION_VALIDATE(args->GetString(keys::kHtmlPath, &html_path)); |
| 34 | 35 |
| 35 const Extension* extension = GetExtension(); | 36 const Extension* extension = GetExtension(); |
| 36 GURL url = extension->GetResourceURL(extension->url(), html_path); | 37 GURL url = extension->GetResourceURL(extension->url(), html_path); |
| 37 | 38 |
| 38 Browser* browser = NULL; | 39 Browser* browser = NULL; |
| 39 TabContents* tab_contents = NULL; | 40 TabContentsWrapper* tab_contents = NULL; |
| 40 if (!ExtensionTabUtil::GetTabById( | 41 if (!ExtensionTabUtil::GetTabById( |
| 41 tab_id, | 42 tab_id, |
| 42 profile(), | 43 profile(), |
| 43 include_incognito(), | 44 include_incognito(), |
| 44 &browser, | 45 &browser, |
| 45 NULL, | 46 NULL, |
| 46 &tab_contents, | 47 &tab_contents, |
| 47 NULL)) { | 48 NULL)) { |
| 48 error_ = ExtensionErrorUtils::FormatErrorMessage( | 49 error_ = ExtensionErrorUtils::FormatErrorMessage( |
| 49 extension_tabs_module_constants::kTabNotFoundError, | 50 extension_tabs_module_constants::kTabNotFoundError, |
| 50 base::IntToString(tab_id)); | 51 base::IntToString(tab_id)); |
| 51 return false; | 52 return false; |
| 52 } | 53 } |
| 53 | 54 |
| 54 tab_contents->AddInfoBar( | 55 tab_contents->tab_contents()->AddInfoBar( |
| 55 new ExtensionInfoBarDelegate(browser, tab_contents, GetExtension(), url)); | 56 new ExtensionInfoBarDelegate(browser, tab_contents->tab_contents(), |
| 57 GetExtension(), url)); |
| 56 | 58 |
| 57 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. | 59 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. |
| 58 result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false)); | 60 result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false)); |
| 59 | 61 |
| 60 return true; | 62 return true; |
| 61 } | 63 } |
| OLD | NEW |