| 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 "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
| 9 #include "chrome/browser/extensions/extension_host.h" | 10 #include "chrome/browser/extensions/extension_host.h" |
| 10 #include "chrome/browser/extensions/extension_infobar_module_constants.h" | 11 #include "chrome/browser/extensions/extension_infobar_module_constants.h" |
| 11 #include "chrome/browser/extensions/extension_infobar_delegate.h" | 12 #include "chrome/browser/extensions/extension_infobar_delegate.h" |
| 12 #include "chrome/browser/extensions/extension_tabs_module.h" | 13 #include "chrome/browser/extensions/extension_tabs_module.h" |
| 13 #include "chrome/browser/extensions/extension_tabs_module_constants.h" | 14 #include "chrome/browser/extensions/extension_tabs_module_constants.h" |
| 14 #include "chrome/browser/tab_contents/infobar_delegate.h" | 15 #include "chrome/browser/tab_contents/infobar_delegate.h" |
| 15 #include "chrome/browser/tab_contents/tab_contents.h" | 16 #include "chrome/browser/tab_contents/tab_contents.h" |
| 16 #include "chrome/common/extensions/extension.h" | 17 #include "chrome/common/extensions/extension.h" |
| 17 #include "chrome/common/extensions/extension_error_utils.h" | 18 #include "chrome/common/extensions/extension_error_utils.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 38 if (!ExtensionTabUtil::GetTabById( | 39 if (!ExtensionTabUtil::GetTabById( |
| 39 tab_id, | 40 tab_id, |
| 40 profile(), | 41 profile(), |
| 41 include_incognito(), | 42 include_incognito(), |
| 42 &browser, | 43 &browser, |
| 43 NULL, | 44 NULL, |
| 44 &tab_contents, | 45 &tab_contents, |
| 45 NULL)) { | 46 NULL)) { |
| 46 error_ = ExtensionErrorUtils::FormatErrorMessage( | 47 error_ = ExtensionErrorUtils::FormatErrorMessage( |
| 47 extension_tabs_module_constants::kTabNotFoundError, | 48 extension_tabs_module_constants::kTabNotFoundError, |
| 48 IntToString(tab_id)); | 49 base::IntToString(tab_id)); |
| 49 return false; | 50 return false; |
| 50 } | 51 } |
| 51 | 52 |
| 52 tab_contents->AddInfoBar( | 53 tab_contents->AddInfoBar( |
| 53 new ExtensionInfoBarDelegate(browser, tab_contents, GetExtension(), url)); | 54 new ExtensionInfoBarDelegate(browser, tab_contents, GetExtension(), url)); |
| 54 | 55 |
| 55 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. | 56 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. |
| 56 result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false)); | 57 result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false)); |
| 57 | 58 |
| 58 return true; | 59 return true; |
| 59 } | 60 } |
| OLD | NEW |