| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/extensions/extension_window_controller.h" |
| 15 #include "chrome/browser/infobars/infobar_tab_helper.h" | 15 #include "chrome/browser/infobars/infobar_tab_helper.h" |
| 16 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" | 16 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" |
| 17 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
| 18 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.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 "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
| 23 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
| 24 | 24 |
| 25 using extensions::Extension; |
| 26 |
| 25 namespace { | 27 namespace { |
| 26 | 28 |
| 27 const char kHtmlPath[] = "path"; | 29 const char kHtmlPath[] = "path"; |
| 28 const char kTabId[] = "tabId"; | 30 const char kTabId[] = "tabId"; |
| 29 const char kHeight[] = "height"; | 31 const char kHeight[] = "height"; |
| 30 | 32 |
| 31 const char kNoCurrentWindowError[] = "No current browser window was found"; | 33 const char kNoCurrentWindowError[] = "No current browser window was found"; |
| 32 const char kTabNotFoundError[] = "Specified tab (or default tab) not found"; | 34 const char kTabNotFoundError[] = "Specified tab (or default tab) not found"; |
| 33 | 35 |
| 34 } // namespace | 36 } // namespace |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 tab_contents->infobar_tab_helper()->AddInfoBar( | 71 tab_contents->infobar_tab_helper()->AddInfoBar( |
| 70 new ExtensionInfoBarDelegate(browser, tab_contents->infobar_tab_helper(), | 72 new ExtensionInfoBarDelegate(browser, tab_contents->infobar_tab_helper(), |
| 71 GetExtension(), url, height)); | 73 GetExtension(), url, height)); |
| 72 | 74 |
| 73 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. | 75 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. |
| 74 DCHECK(browser->extension_window_controller()); | 76 DCHECK(browser->extension_window_controller()); |
| 75 result_.reset(browser->extension_window_controller()->CreateWindowValue()); | 77 result_.reset(browser->extension_window_controller()->CreateWindowValue()); |
| 76 | 78 |
| 77 return true; | 79 return true; |
| 78 } | 80 } |
| OLD | NEW |